Make tests more robust

src/actions/createBillingAgreement.js

@@ -5,7 +5,7 @@ export default (cookies, dispatch) => event => {
   event.preventDefault()
   return axios({
     method: 'POST',
-    timeout: 50000,
+    timeout: 30000,
     url: '/paypal/new.json',
     data: {
       plan: 1
@@ -16,9 +16,9 @@ export default (cookies, dispatch) => event => {
   })
     .then(response => window.location.assign(response.data.redirect_url))
     .catch(error => {
-      dispatch(dispatch({
+      dispatch({
         type: CREATE_BILLING_AGREEMENT_FAILURE,
         message: error.message
-      }))
+      })
     })
 }

src/actions/executeBillingAgreement.js

@@ -2,13 +2,10 @@ import axios from 'axios'
 import { EXECUTE_BILLING_AGREEMENT_FAILURE } from '../types'
 
 export default (cookies, params, dispatch) => {
-  console.log('cookies', cookies)
-  console.log('params', params)
-  console.log('dispatch', dispatch)
   return axios({
     method: 'GET',
-    timeout: 50000,
-    url: '/paypal/create.json',
+    timeout: 20000,
+    url: '/paypal/create',
     params: {
       plan: params.plan,
       token: params.token

src/tests/actions/createBillingAgreement.test.js

@@ -5,7 +5,7 @@ import thunk from 'redux-thunk'
 import configureMockStore from 'redux-mock-store'
 import { CREATE_BILLING_AGREEMENT_FAILURE } from '../../types'
 
-describe('createBillingAgreement helper', () => {
+describe('createBillingAgreement action', () => {
   const middlewares = [thunk]
   const mockStore = configureMockStore(middlewares)
   let store
@@ -50,7 +50,8 @@ describe('createBillingAgreement helper', () => {
     expect(window.location.assign).toHaveBeenCalledWith(billingAgreementResponse.data.redirect_url)
   })
 
-  it('dispatches if an error is returned', () => {
+  it('dispatches if an error is returned', async () => {
+    expect.assertions(1)
     const error = new Error('Error: Request failed with status code 500')
     const errorMessage = {
       type: CREATE_BILLING_AGREEMENT_FAILURE,
@@ -62,7 +63,7 @@ describe('createBillingAgreement helper', () => {
     })
 
     store.dispatch(errorMessage)
-    createBillingAgreement(cookies, dispatch)(event).then(() => {
+    await createBillingAgreement(cookies, dispatch)(event).then(() => {
       expect(store.getActions()).toEqual([errorMessage])
     })
   })

src/tests/actions/executeBillingAgreement.test.js

@@ -5,44 +5,63 @@ import thunk from 'redux-thunk'
 import configureMockStore from 'redux-mock-store'
 import { EXECUTE_BILLING_AGREEMENT_FAILURE } from '../../types'
 
-describe('executeBillingAgreement helper', () => {
+describe('executeBillingAgreement action', () => {
   const middlewares = [thunk]
   const mockStore = configureMockStore(middlewares)
   let store
   const cookies = { get: jest.fn() }
-  const params = { plan: 'premium', token: 'valid_token' }
+  const params = { plan: 'premium', token: '' }
   const dispatch = jest.fn()
-  beforeEach(() => {
+  beforeEach(done => {
     moxios.install()
     store = mockStore({})
+    done()
   })
 
   afterEach(() => {
     moxios.uninstall()
   })
 
-  it('posts plan info to Rails backend and returns with redirect url', () => {
+  it('posts plan info to Rails backend and returns with redirect url', async () => {
+    expect.assertions(1)
     moxios.stubRequest('/paypal/create.json', {
       status: 200,
       response: executedBillingAgreementResponse
     })
-    executeBillingAgreement(cookies, params)
-    expect(executedBillingAgreementResponse).toEqual({ data: { message: 'Success' } })
+
+    moxios.wait(() => {
+      const request = moxios.requests.mostRecent()
+      request.resolve(executedBillingAgreementResponse)
+    })
+
+    await executeBillingAgreement(cookies, params, dispatch).then(() => {
+      expect(executedBillingAgreementResponse).toEqual({
+        data: { message: 'Success' }
+      })
+    })
   })
 
-  it('dispatches if an error is returned', () => {
+  it('dispatches if an error is returned', async () => {
+    expect.assertions(1)
     const error = new Error('Error: Request failed with status code 500')
     const errorMessage = {
       type: EXECUTE_BILLING_AGREEMENT_FAILURE,
-      message: error
+      message: error.message
     }
+
     moxios.stubRequest('/paypal/create.json', {
       status: 500,
-      response: { errorMessage }
+      response: error.message
+    })
+
+    moxios.wait(() => {
+      const request = moxios.requests.mostRecent()
+      request.reject(errorMessage)
     })
+
     store.dispatch(errorMessage)
-    executeBillingAgreement(cookies, params, dispatch).then(() => {
-      expect(store.getActions()).toEqual(errorMessage)
+    await executeBillingAgreement(cookies, params, dispatch).then(() => {
+      expect(store.getActions()).toEqual([errorMessage])
     })
   })
 })

src/tests/containers/ProjectsList.test.js

@@ -54,6 +54,7 @@ describe('ProjectsList', () => {
         projects={paginatedProjectsFixture}
         fetchProjects={() => {}}
         setLastLocation={() => {}}
+        location={{ pathname: '/projects' }}
       />
     )
     wrapper.setState(
@@ -92,15 +93,25 @@ describe('ProjectsList', () => {
   it("shouldn't render a Project component without projects", () => {
     const wrapper = mount(
       <StaticRouter context={context}>
-        <ProjectsList projects={{ 1: [] }} fetchProjects={() => {}} setLastLocation={() => {}} />
+        <ProjectsList
+          projects={{ 1: [] }}
+          fetchProjects={() => {}}
+          setLastLocation={() => {}}
+          location={{ pathname: '/projects' }}
+        />
       </StaticRouter>
     )
     expect(wrapper.find('Project')).toHaveLength(0)
   })
 
   it('should test componentWillReceiveProps', () => {
     const wrapper = shallow(
-      <ProjectsList projects={[]} fetchProjects={() => {}} setLastLocation={() => {}} />
+      <ProjectsList
+        projects={[]}
+        fetchProjects={() => {}}
+        setLastLocation={() => {}}
+        location={{ pathname: '/projects' }}
+      />
     )
     wrapper.setProps({ projects: [{ id: 1, languages: [] }] })
     expect(wrapper.instance().state.projects).toEqual({
@@ -110,12 +121,15 @@ describe('ProjectsList', () => {
 
   it('should call normalizeFilteredProjects', () => {
     const wrapper = shallow(
-      <ProjectsList projects={[]} fetchProjects={() => {}} setLastLocation={() => {}} />
+      <ProjectsList
+        projects={[]}
+        fetchProjects={() => {}}
+        setLastLocation={() => {}}
+        location={{ pathname: '/projects' }}
+      />
     )
     wrapper.setProps({ projects: projectsFixture })
-    expect(wrapper.instance().state.projects).toEqual(
-      paginatedProjectsFixture
-    )
+    expect(wrapper.instance().state.projects).toEqual(paginatedProjectsFixture)
   })
 
   it('should filter projects', () => {
@@ -134,7 +148,13 @@ describe('ProjectsList', () => {
 
   it('adds error to the state if fetchProjects fails', async () => {
     const wrapper = shallow(
-      <ProjectsList projects={[]} error={[]} fetchProjects={() => {}} setLastLocation={() => {}} location={{ pathname: '/projects' }} />
+      <ProjectsList
+        projects={[]}
+        error={[]}
+        fetchProjects={() => {}}
+        setLastLocation={() => {}}
+        location={{ pathname: '/projects' }}
+      />
     )
     await wrapper.instance().componentDidMount()
     expect(wrapper.state().error).toEqual(true)