billing history tests

Author: na3d

src/api/account.js

@@ -4,9 +4,7 @@ import { actions } from './configs/account';
 
 export function transferPool() {
   return async (dispatch) => {
-    const _transferpool = await dispatch(
-      thunkFetch.get('/account/transfer')
-    );
-    dispatch(actions.one({ _transferpool }, 0));
+    const _transferpool = await dispatch(thunkFetch.get('/account/transfer'));
+    dispatch(actions.one({ _transferpool }));
   };
 }

src/api/apiResultActionReducerGenerator.js

@@ -118,7 +118,7 @@ export function generateDefaultStateOne(config, one) {
 export class ReducerGenerator {
   static one(config, oldStateMany, action) {
     if (config.singular) {
-      return action.resource;
+      return { ...oldStateMany, ...action.resource };
     }
 
     const nonNanActionIds = (action.ids || []).filter(i => !_.isNaN(i));

src/billing/layouts/DashboardPage.js

@@ -10,15 +10,9 @@ import { Table } from 'linode-components/tables';
 import { LinkCell } from 'linode-components/tables/cells';
 
 import { setSource } from '~/actions/source';
-import { account, invoices } from '~/api';
 
 
 export class DashboardPage extends Component {
-  static async preload({ dispatch }) {
-    await dispatch(account.one());
-    await dispatch(invoices.all());
-  }
-
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch(setSource(__filename));

src/billing/layouts/HistoryPage.js

@@ -13,11 +13,6 @@ import { setSource } from '~/actions/source';
 
 
 export class HistoryPage extends Component {
-  static async preload({ dispatch }) {
-    await dispatch(account.one());
-    await dispatch(invoices.all());
-  }
-
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch(setSource(__filename));

src/billing/layouts/IndexPage.js

@@ -5,9 +5,14 @@ import { push } from 'react-router-redux';
 import { Tabs } from 'linode-components/tabs';
 
 import { setAnalytics, setTitle } from '~/actions';
+import { account, invoices } from '~/api';
 
 
 export class IndexPage extends Component {
+  static async preload({ dispatch }) {
+    await Promise.all([account.one(), invoices.all()].map(r => dispatch(r)));
+  }
+
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch(setTitle('Billing'));

src/billing/layouts/InvoicePage.js

@@ -16,7 +16,6 @@ import { setSource } from '~/actions/source';
 
 export class InvoicePage extends Component {
   static async preload({ dispatch, getState }, { invoiceId }) {
-    await dispatch(invoices.one([invoiceId]));
     await dispatch(invoices.items.one([invoiceId]));
   }
 
@@ -41,6 +40,9 @@ export class InvoicePage extends Component {
                   label: 'From',
                   headerClassName: 'DateColumn',
                   formatFn: (from) => {
+                    if(!from) {
+                      return;
+                    }
                     const time = moment.utc(from, moment.iso_8601).tz(timezone);
                     return time.format('MMM D YYYY h:mm A z');
                   },
@@ -50,6 +52,9 @@ export class InvoicePage extends Component {
                   label: 'To',
                   headerClassName: 'DateColumn',
                   formatFn: (to) => {
+                    if(!to) {
+                      return;
+                    }
                     const time = moment.utc(to, moment.iso_8601).tz(timezone);
                     return time.format('MMM D YYYY h:mm A z');
                   },
@@ -66,6 +71,9 @@ export class InvoicePage extends Component {
                   headerClassName: 'IntegerColumn text-right',
                   className: 'text-right',
                   formatFn: (unitPrice) => {
+                    if(!unitPrice) {
+                      return;
+                    }
                     return `$${parseFloat(unitPrice).toFixed(4)}`;
                   },
                 },

test/billing/layouts/HistoryPage.spec.js

@@ -0,0 +1,47 @@
+import React from 'react';
+import sinon from 'sinon';
+import { mount } from 'enzyme';
+import { expect } from 'chai';
+import moment from 'moment-timezone';
+
+import { HistoryPage } from '~/billing/layouts/HistoryPage';
+import { api } from '@/data';
+import { account } from '@/data/account';
+
+
+const { invoices } = api;
+
+describe('billing/layouts/HistoryPage', () => {
+  const sandbox = sinon.sandbox.create();
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  const dispatch = sandbox.spy();
+
+  it('renders a list of invoices', () => {
+    const page = mount(
+      <HistoryPage
+        dispatch={dispatch}
+        account={account}
+        invoices={invoices.invoices}
+      />
+    );
+
+    const rowCount = Object.keys(invoices.invoices).length;
+    expect(page.find('.TableRow').length).to.equal(rowCount);
+  });
+  
+  it('renders account balance', () => {
+    const page = mount(
+      <HistoryPage
+        dispatch={dispatch}
+        account={account}
+        invoices={invoices.invoices}
+      />
+    );
+
+    expect(page.find('strong').text()).to.equal(`Current Balance: $${account.balance}`);
+  });
+});