"Book Value Growth" Parameter Addition - Request

.travis.yml

@@ -1,4 +1,3 @@
 language: node_js
 node_js:
   - "5.1.0"
-  - "4.2.2"

app/__tests__/__snapshots__/api-tests.js.snap

@@ -0,0 +1,30 @@
+exports[`test REST apis calls the get api 1`] = `
+Array [
+  Array [
+    "/api/users/me/",
+    Object {
+      "credentials": "same-origin",
+      "headers": Object {
+        "Accept": "application/json",
+      },
+      "method": "get",
+    },
+  ],
+]
+`;
+
+exports[`test REST apis calls the post api 1`] = `
+Array [
+  Array [
+    "/logout/",
+    Object {
+      "credentials": "same-origin",
+      "headers": Object {
+        "Accept": "application/json",
+        "X-CSRFToken": "",
+      },
+      "method": "post",
+    },
+  ],
+]
+`;

app/__tests__/api-tests.js

@@ -1,49 +1,33 @@
 "use strict";
-jest.autoMockOff();
 jest.mock('fetch-on-rest');
+import api from '../api.js'
 
 describe('test REST apis', function () {
-  var api = require('app/api.js');
 
-  afterEach(function() {
+  beforeEach(() => {
+    window.fetch.mockClear()
+  })
+
+  afterEach(() => {
     expect(api.getPending()).toEqual([]);
   });
 
-  pit('calls the get api', function() {
+  it('calls the post api', function() {
+    api.setResponse('/logout/', JSON.stringify({}));
+    return api.logout().then(() => {
+      expect(window.fetch.mock.calls).toMatchSnapshot()
+    });
+  });
+
+  it('calls the get api', function() {
     api.setResponse('/api/users/me/', JSON.stringify({foo: 'bar'}));
     return api.get(api.me).then(resp => {
       expect(resp).toEqual({foo: 'bar'});
-      expect(window.fetch.mock.calls.length).toBe(1);
-      expect(window.fetch.mock.calls[0][0]).toEqual('/api/users/me/');
-      var headers = {
-        credentials: 'same-origin',
-        headers: {
-          Accept: 'application/json'
-        },
-        method: 'get'
-      };
-      expect(window.fetch.mock.calls[0][1]).toEqual(headers);
+      expect(window.fetch.mock.calls).toMatchSnapshot()
     })
   });
 
-  pit('calls the post api', function() {
-    api.setResponse('/logout/', JSON.stringify({}));
-    return api.logout().then(() => {
-      expect(window.fetch.mock.calls.length).toBe(1);
-      expect(window.fetch.mock.calls[0][0]).toEqual('/logout/');
-      var headers = {
-        credentials: 'same-origin',
-        headers: {
-          Accept: 'application/json',
-          'X-CSRFToken': ''
-        },
-        method: 'post'
-      };
-      expect(window.fetch.mock.calls[0][1]).toEqual(headers);
-    });
-  });
-
-  pit('calls the delete api', function() {
+  it('calls the delete api', function() {
     api.setResponse('/api/screens/33/?foo=bar', "{}");
     return api.delete(['screens', 33], {foo: 'bar'}).then(() => {
       expect(window.fetch).toBeCalledWith(
@@ -64,7 +48,6 @@ describe('test REST apis', function () {
 
 describe('test dependent libraries', function(){
   it('checks expansions', function() {
-    var api = require('app/api.js');
     expect(api._getUrl(api.me)).toEqual('/api/users/me/');
     expect(api._getUrl(api.me, {})).toEqual('/api/users/me/');
     expect(api._getUrl(api.me, {foo: 'bar'})).toEqual('/api/users/me/?foo=bar');

app/__tests__/watchlist-tests.js

@@ -1,9 +1,13 @@
 'use strict';
-jest.autoMockOff();
-jest.mock('fetch-on-rest');
-
-
-var screen = {
+jest.disableAutomock()
+jest.mock('fetch-on-rest')
+import api from '../api.js'
+import React from 'react'
+import ReactDOM from 'react-dom'
+import Watchlist from '../watchlist.jsx'
+import TestUtils from 'react-addons-test-utils'
+
+var SCREEN = {
   ratios: [[
     "Current price",
     "CMP",
@@ -15,19 +19,17 @@ var screen = {
 };
 
 describe('watchlist Tests', function() {
-  var api = require('app/api.js');
-  var watchlist, TestUtils;
+  var watchlist
 
   beforeEach(function() {
-    var React = require('react');
-    var Watchlist = require('../watchlist.jsx');
-    window.loggedIn = true;
-    TestUtils = require('react-addons-test-utils');
     var params = {
       search: '',
       query: {},
       pathname: '/watchlist/'
     };
+    window.loggedIn = true;
+    api.setResponse('/api/users/watchlist/',
+      JSON.stringify(SCREEN));
     watchlist = TestUtils.renderIntoDocument(
       <Watchlist location={params}/>
     );
@@ -37,21 +39,14 @@ describe('watchlist Tests', function() {
     expect(api.getPending()).toEqual([]);
   });
 
-  it('should show loading', function() {
-    var ReactDOM = require('react-dom');
+  it('should load watchlist', function() {
     var dom = ReactDOM.findDOMNode(watchlist);
     expect(dom.textContent).toEqual('Loading...');
-  });
-
-  pit('should load watchlist', function() {
-    api.setResponse('/api/users/watchlist/',
-      JSON.stringify(screen));
-    return watchlist.componentDidMount().then(() => {
-      expect(watchlist.state.screen).toEqual(screen);
+    return watchlist._req.then(() => {
+      expect(watchlist.state.screen).toEqual(SCREEN);
       var table = TestUtils.findRenderedDOMComponentWithTag(
         watchlist, 'table');
       expect(table).toBeDefined();
     });
   });
-
 });

app/api.js

@@ -1,5 +1,5 @@
 "use strict";
-var Rest = require('fetch-on-rest');
+import Rest from 'fetch-on-rest'
 
 function getCookie(sKey) {
   if (!sKey) { return ''; }
@@ -54,4 +54,4 @@ Api.cid = function(cid, component) {
   return ['company', cid, component];
 };
 
-module.exports = Api;
+export default Api

app/base.jsx

@@ -1,12 +1,11 @@
-"use strict";
-var React = require('react');
-var Link = require('react-router').Link;
-var Nav = require('react-bootstrap/lib/Nav');
-var Navbar = require('react-bootstrap/lib/Navbar');
-var NavbarBrand = require('react-bootstrap/lib/NavbarBrand');
+import React from 'react'
+import {Link} from 'react-router'
+import Nav from 'react-bootstrap/lib/Nav'
+import Navbar from 'react-bootstrap/lib/Navbar'
+import NavbarBrand from 'react-bootstrap/lib/NavbarBrand'
 
-var CompanySearch = require('./components/company.search.jsx');
-var Api = require('./api.js');
+import CompanySearch from './components/company.search.jsx'
+import Api from './api.js'
 
 
 function Footer() {
@@ -16,9 +15,8 @@ function Footer() {
       Made with <i className="glyphicon glyphicon-heart" /> in <b>India</b>.
     </span>
     <p>
-      Navigation Links: <Link to="/">Home
+      Navigation Links: <Link to="/home/">Home
       </Link> | <Link to="/screens/">Screens
-      </Link> | <Link to="/talks/">Talks
       </Link> | <a href="http://blog.screener.in">Change Log
       </a> | <a href="http://dalal-street.in">Dalal-Street Blog
       </a> | <a href="https://github.com/Mittal-Analytics/Screener.in">
@@ -108,14 +106,13 @@ class Navigation extends React.Component {
         </div>
 
         <Navbar.Collapse>
-          <Nav eventKey={0}>
+          <Nav>
             <li className="visible-lg-block">
               <a href="http://dalal-street.in">Blog</a>
             </li>
             <li className="visible-lg-block"><a href="http://blog.screener.in">
               {this.state.user.id ? 'Change Log' : 'Features'}
             </a></li>
-            <li><Link to="/talks/">Talks</Link></li>
             <li><Link to="/screens/">Screens</Link></li>
             <li><Link to="/watchlist/">Watchlist</Link></li>
           </Nav>
@@ -133,5 +130,5 @@ Navigation.contextTypes = {
 }
 
 
-module.exports.Navigation = Navigation;
-module.exports.Footer = Footer;
+export { Navigation }
+export { Footer }

app/company/__tests__/misc-tests.js

@@ -1,6 +1,8 @@
 "use strict";
-jest.autoMockOff();
-jest.mock('fetch-on-rest');
+import React from 'react'
+import ReactDOM from 'react-dom'
+import TestUtils from 'react-addons-test-utils'
+import {CompanyHeader} from '../misc.jsx'
 
 var kitex = {
   id: 1950,
@@ -29,28 +31,11 @@ var kitex = {
 
 
 describe('Walk tests', function () {
-  var api = require('app/api.js');
-  var Misc, TestUtils, api, ReactDOM, React;
-
-  beforeEach(function() {
-    React = require('react');
-    ReactDOM = require('react-dom');
-    TestUtils = require('react-addons-test-utils');
-    Misc = require.requireActual('../misc.jsx');
-  });
-
-  afterEach(function() {
-    expect(api.getPending()).toEqual([]);
-  });
 
   it('test visible add to watchlist button', function() {
-    var dummy = jest.genMockFunction().mockImplementation(
-      function(cid) {
-        return api.post(['company', cid, 'favorite']);
-      }
-    );
+    var dummy = jest.genMockFunction()
     var header = TestUtils.renderIntoDocument(<div>
-      <Misc.CompanyHeader
+      <CompanyHeader
         company={kitex}
         favorites={[1, 2]}
         handleFavorite={dummy}
@@ -65,7 +50,7 @@ describe('Walk tests', function () {
 
     // button hiddend when in favorites
     header = TestUtils.renderIntoDocument(<div>
-      <Misc.CompanyHeader
+      <CompanyHeader
         company={kitex}
         favorites={[1950, 2]}
         handleFavorite={dummy}

app/company/__tests__/peers-tests.js

@@ -1,9 +1,13 @@
 "use strict";
-jest.autoMockOff();
+jest.disableAutomock();
 jest.mock('fetch-on-rest');
+import api from '../../api.js'
+import React from 'react'
+import ReactDOM from 'react-dom'
+import TestUtils from 'react-addons-test-utils'
+import Peers from '../peers.jsx'
 
 describe('Peers tests', function () {
-  var api = require('app/api.js');
   var peerResults = {
     ratios: [],
     results: []
@@ -13,18 +17,20 @@ describe('Peers tests', function () {
     expect(api.getPending()).toEqual([]);
   });
 
-  pit('renders a peers table', function() {
-    var React = require('react');
-    var ReactDOM = require('react-dom');
-    var TestUtils = require('react-addons-test-utils');
-    var Peers = require('../peers.jsx');
-    var props = {wid: 22, industry: 'Hi', short_name: 'hi'};
-    var peers = TestUtils.renderIntoDocument(
-      <Peers {...props} />
-    );
+  it('renders a peers table', function() {
+    var company = {
+      short_name: 'hi',
+      warehouse_set: {
+        id: 22,
+        industry: 'Hi'
+      }
+    }
     api.setResponse('/api/company/22/peers/?industry=Hi',
       JSON.stringify(peerResults));
-    return peers.componentDidMount().then(() => {
+    var peers = TestUtils.renderIntoDocument(
+      <Peers company={company} />
+    );
+    return peers._req.then(() => {
       var dom = ReactDOM.findDOMNode(peers);
       expect(dom.textContent).toContain('Peer Comparison ');
     })