api.js refactor using classes (#250)

Refactor api.js into an api module where endpoint specific models can be imported and used in components.

__tests__/pages/Login.test.jsx

@@ -2,7 +2,9 @@ import React from 'react';
 import { mountWithContexts } from '../enzymeHelpers';
 import { asyncFlush } from '../../jest.setup';
 import AWXLogin from '../../src/pages/Login';
-import APIClient from '../../src/api';
+import { RootAPI } from '../../src/api';
+
+jest.mock('../../src/api');
 
 describe('<Login />', () => {
   let loginWrapper;
@@ -14,12 +16,8 @@ describe('<Login />', () => {
   let submitButton;
   let loginHeaderLogo;
 
-  const api = new APIClient({});
-
   const mountLogin = () => {
-    loginWrapper = mountWithContexts(<AWXLogin />, { context: { network: {
-      api, handleHttpError: () => {}
-    } } });
+    loginWrapper = mountWithContexts(<AWXLogin />, { context: { network: {} } });
   };
 
   const findChildren = () => {
@@ -33,6 +31,7 @@ describe('<Login />', () => {
   };
 
   afterEach(() => {
+    jest.clearAllMocks();
     loginWrapper.unmount();
   });
 
@@ -98,32 +97,31 @@ describe('<Login />', () => {
     expect(loginWrapper.find('.pf-c-form__helper-text.pf-m-error').length).toBe(0);
   });
 
-  test('api.login not called when loading', () => {
-    api.login = jest.fn().mockImplementation(() => Promise.resolve({}));
+  test('login API not called when loading', () => {
     mountLogin();
     findChildren();
     expect(awxLogin.state().isLoading).toBe(false);
     awxLogin.setState({ isLoading: true });
     submitButton.simulate('click');
-    expect(api.login).toHaveBeenCalledTimes(0);
+    expect(RootAPI.login).toHaveBeenCalledTimes(0);
   });
 
-  test('submit calls api.login successfully', async () => {
-    api.login = jest.fn().mockImplementation(() => Promise.resolve({}));
+  test('submit calls login API successfully', async () => {
+    RootAPI.login = jest.fn().mockImplementation(() => Promise.resolve({}));
     mountLogin();
     findChildren();
     expect(awxLogin.state().isLoading).toBe(false);
     awxLogin.setState({ username: 'unamee', password: 'pwordd' });
     submitButton.simulate('click');
-    expect(api.login).toHaveBeenCalledTimes(1);
-    expect(api.login).toHaveBeenCalledWith('unamee', 'pwordd');
+    expect(RootAPI.login).toHaveBeenCalledTimes(1);
+    expect(RootAPI.login).toHaveBeenCalledWith('unamee', 'pwordd');
     expect(awxLogin.state().isLoading).toBe(true);
     await asyncFlush();
     expect(awxLogin.state().isLoading).toBe(false);
   });
 
-  test('submit calls api.login handles 401 error', async () => {
-    api.login = jest.fn().mockImplementation(() => {
+  test('submit calls login API and handles 401 error', async () => {
+    RootAPI.login = jest.fn().mockImplementation(() => {
       const err = new Error('401 error');
       err.response = { status: 401, message: 'problem' };
       return Promise.reject(err);
@@ -134,16 +132,16 @@ describe('<Login />', () => {
     expect(awxLogin.state().isInputValid).toBe(true);
     awxLogin.setState({ username: 'unamee', password: 'pwordd' });
     submitButton.simulate('click');
-    expect(api.login).toHaveBeenCalledTimes(1);
-    expect(api.login).toHaveBeenCalledWith('unamee', 'pwordd');
+    expect(RootAPI.login).toHaveBeenCalledTimes(1);
+    expect(RootAPI.login).toHaveBeenCalledWith('unamee', 'pwordd');
     expect(awxLogin.state().isLoading).toBe(true);
     await asyncFlush();
     expect(awxLogin.state().isInputValid).toBe(false);
     expect(awxLogin.state().isLoading).toBe(false);
   });
 
-  test('submit calls api.login handles non-401 error', async () => {
-    api.login = jest.fn().mockImplementation(() => {
+  test('submit calls login API and handles non-401 error', async () => {
+    RootAPI.login = jest.fn().mockImplementation(() => {
       const err = new Error('500 error');
       err.response = { status: 500, message: 'problem' };
       return Promise.reject(err);
@@ -153,8 +151,8 @@ describe('<Login />', () => {
     expect(awxLogin.state().isLoading).toBe(false);
     awxLogin.setState({ username: 'unamee', password: 'pwordd' });
     submitButton.simulate('click');
-    expect(api.login).toHaveBeenCalledTimes(1);
-    expect(api.login).toHaveBeenCalledWith('unamee', 'pwordd');
+    expect(RootAPI.login).toHaveBeenCalledTimes(1);
+    expect(RootAPI.login).toHaveBeenCalledWith('unamee', 'pwordd');
     expect(awxLogin.state().isLoading).toBe(true);
     await asyncFlush();
     expect(awxLogin.state().isLoading).toBe(false);

__tests__/pages/Organizations/components/OrganizationForm.test.jsx

@@ -2,9 +2,12 @@ import React from 'react';
 import { mountWithContexts } from '../../../enzymeHelpers';
 import { sleep } from '../../../testUtils';
 import OrganizationForm from '../../../../src/pages/Organizations/components/OrganizationForm';
+import { OrganizationsAPI } from '../../../../src/api';
+
+jest.mock('../../../../src/api');
 
 describe('<OrganizationForm />', () => {
-  let network;
+  const network = {};
 
   const mockData = {
     id: 1,
@@ -16,24 +19,11 @@ describe('<OrganizationForm />', () => {
     }
   };
 
-  beforeEach(() => {
-    network = {};
-  });
-
   afterEach(() => {
     jest.clearAllMocks();
   });
 
   test('should request related instance groups from api', () => {
-    const mockInstanceGroups = [
-      { name: 'One', id: 1 },
-      { name: 'Two', id: 2 }
-    ];
-    network.api = {
-      getOrganizationInstanceGroups: jest.fn(() => (
-        Promise.resolve({ data: { results: mockInstanceGroups } })
-      ))
-    };
     mountWithContexts(
       (
         <OrganizationForm
@@ -46,7 +36,7 @@ describe('<OrganizationForm />', () => {
       }
     );
 
-    expect(network.api.getOrganizationInstanceGroups).toHaveBeenCalledTimes(1);
+    expect(OrganizationsAPI.readInstanceGroups).toHaveBeenCalledTimes(1);
   });
 
   test('componentDidMount should set instanceGroups to state', async () => {
@@ -54,11 +44,11 @@ describe('<OrganizationForm />', () => {
       { name: 'One', id: 1 },
       { name: 'Two', id: 2 }
     ];
-    network.api = {
-      getOrganizationInstanceGroups: jest.fn(() => (
-        Promise.resolve({ data: { results: mockInstanceGroups } })
-      ))
-    };
+    OrganizationsAPI.readInstanceGroups.mockReturnValue({
+      data: {
+        results: mockInstanceGroups
+      }
+    });
     const wrapper = mountWithContexts(
       (
         <OrganizationForm
@@ -72,7 +62,7 @@ describe('<OrganizationForm />', () => {
     );
 
     await sleep(0);
-    expect(network.api.getOrganizationInstanceGroups).toHaveBeenCalled();
+    expect(OrganizationsAPI.readInstanceGroups).toHaveBeenCalled();
     expect(wrapper.find('OrganizationForm').state().instanceGroups).toEqual(mockInstanceGroups);
   });
 
@@ -165,20 +155,20 @@ describe('<OrganizationForm />', () => {
       { name: 'One', id: 1 },
       { name: 'Two', id: 2 }
     ];
-    network.api = {
-      getOrganizationInstanceGroups: jest.fn(() => (
-        Promise.resolve({ data: { results: mockInstanceGroups } })
-      ))
-    };
+    OrganizationsAPI.readInstanceGroups.mockReturnValue({
+      data: {
+        results: mockInstanceGroups
+      }
+    });
     const mockDataForm = {
       name: 'Foo',
       description: 'Bar',
       custom_virtualenv: 'Fizz',
     };
     const handleSubmit = jest.fn();
-    network.api.updateOrganizationDetails = jest.fn().mockResolvedValue(1, mockDataForm);
-    network.api.associateInstanceGroup = jest.fn().mockResolvedValue('done');
-    network.api.disassociate = jest.fn().mockResolvedValue('done');
+    OrganizationsAPI.update.mockResolvedValue(1, mockDataForm);
+    OrganizationsAPI.associateInstanceGroup.mockResolvedValue('done');
+    OrganizationsAPI.disassociateInstanceGroup.mockResolvedValue('done');
     const wrapper = mountWithContexts(
       (
         <OrganizationForm

__tests__/pages/Organizations/screens/Organization/Organization.test.jsx

@@ -1,6 +1,11 @@
 import React from 'react';
+import { createMemoryHistory } from 'history';
 import { mountWithContexts } from '../../../../enzymeHelpers';
+import { sleep } from '../../../../testUtils';
 import Organization from '../../../../../src/pages/Organizations/screens/Organization/Organization';
+import { OrganizationsAPI } from '../../../../../src/api';
+
+jest.mock('../../../../../src/api');
 
 describe.only('<Organization />', () => {
   const me = {
@@ -12,8 +17,41 @@ describe.only('<Organization />', () => {
     mountWithContexts(<Organization me={me} />);
   });
 
-  test('notifications tab shown/hidden based on permissions', () => {
-    const wrapper = mountWithContexts(<Organization me={me} />);
+  test('notifications tab shown/hidden based on permissions', async () => {
+    OrganizationsAPI.readDetail.mockResolvedValue({
+      data: {
+        id: 1,
+        name: 'foo'
+      }
+    });
+    OrganizationsAPI.read.mockResolvedValue({
+      data: {
+        results: []
+      }
+    });
+    const history = createMemoryHistory({
+      initialEntries: ['/organizations/1/details'],
+    });
+    const match = { path: '/organizations/:id', url: '/organizations/1' };
+    const wrapper = mountWithContexts(
+      <Organization
+        me={me}
+        setBreadcrumb={() => {}}
+      />,
+      {
+        context: {
+          router: {
+            history,
+            route: {
+              location: history.location,
+              match
+            }
+          }
+        }
+      }
+    );
+    await sleep(0);
+    wrapper.update();
     expect(wrapper.find('.pf-c-tabs__item').length).toBe(3);
     expect(wrapper.find('.pf-c-tabs__button[children="Notifications"]').length).toBe(0);
     wrapper.find('Organization').setState({

__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx

@@ -3,8 +3,12 @@ import { mountWithContexts } from '../../../../enzymeHelpers';
 import OrganizationAccess from '../../../../../src/pages/Organizations/screens/Organization/OrganizationAccess';
 import { sleep } from '../../../../testUtils';
 
+import { OrganizationsAPI, TeamsAPI, UsersAPI } from '../../../../../src/api';
+
+jest.mock('../../../../../src/api');
+
 describe('<OrganizationAccess />', () => {
-  let network;
+  const network = {};
   const organization = {
     id: 1,
     name: 'Default',
@@ -60,15 +64,11 @@ describe('<OrganizationAccess />', () => {
   };
 
   beforeEach(() => {
-    network = {
-      api: {
-        getOrganizationAccessList: jest.fn()
-          .mockReturnValue(Promise.resolve({ data })),
-        disassociateTeamRole: jest.fn(),
-        disassociateUserRole: jest.fn(),
-        toJSON: () => '/api/',
-      },
-    };
+    OrganizationsAPI.readAccessList.mockReturnValue({ data });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
   });
 
   test('initially renders succesfully', () => {
@@ -86,7 +86,7 @@ describe('<OrganizationAccess />', () => {
     );
     await sleep(0);
     wrapper.update();
-    expect(network.api.getOrganizationAccessList).toHaveBeenCalled();
+    expect(OrganizationsAPI.readAccessList).toHaveBeenCalled();
     expect(wrapper.find('OrganizationAccess').state('isInitialized')).toBe(true);
     expect(wrapper.find('PaginatedDataList').prop('items')).toEqual(data.results);
     expect(wrapper.find('OrganizationAccessItem')).toHaveLength(2);
@@ -127,8 +127,8 @@ describe('<OrganizationAccess />', () => {
     const component = wrapper.find('OrganizationAccess');
     expect(component.state('roleToDelete')).toBeNull();
     expect(component.state('roleToDeleteAccessRecord')).toBeNull();
-    expect(network.api.disassociateTeamRole).not.toHaveBeenCalled();
-    expect(network.api.disassociateUserRole).not.toHaveBeenCalled();
+    expect(TeamsAPI.disassociateRole).not.toHaveBeenCalled();
+    expect(UsersAPI.disassociateRole).not.toHaveBeenCalled();
   });
 
   it('should delete user role', async () => {
@@ -149,9 +149,9 @@ describe('<OrganizationAccess />', () => {
     const component = wrapper.find('OrganizationAccess');
     expect(component.state('roleToDelete')).toBeNull();
     expect(component.state('roleToDeleteAccessRecord')).toBeNull();
-    expect(network.api.disassociateTeamRole).not.toHaveBeenCalled();
-    expect(network.api.disassociateUserRole).toHaveBeenCalledWith(1, 1);
-    expect(network.api.getOrganizationAccessList).toHaveBeenCalledTimes(2);
+    expect(TeamsAPI.disassociateRole).not.toHaveBeenCalled();
+    expect(UsersAPI.disassociateRole).toHaveBeenCalledWith(1, 1);
+    expect(OrganizationsAPI.readAccessList).toHaveBeenCalledTimes(2);
   });
 
   it('should delete team role', async () => {
@@ -172,8 +172,8 @@ describe('<OrganizationAccess />', () => {
     const component = wrapper.find('OrganizationAccess');
     expect(component.state('roleToDelete')).toBeNull();
     expect(component.state('roleToDeleteAccessRecord')).toBeNull();
-    expect(network.api.disassociateTeamRole).toHaveBeenCalledWith(5, 3);
-    expect(network.api.disassociateUserRole).not.toHaveBeenCalled();
-    expect(network.api.getOrganizationAccessList).toHaveBeenCalledTimes(2);
+    expect(TeamsAPI.disassociateRole).toHaveBeenCalledWith(5, 3);
+    expect(UsersAPI.disassociateRole).not.toHaveBeenCalled();
+    expect(OrganizationsAPI.readAccessList).toHaveBeenCalledTimes(2);
   });
 });

__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx

@@ -1,6 +1,9 @@
 import React from 'react';
 import { mountWithContexts } from '../../../../enzymeHelpers';
 import OrganizationDetail from '../../../../../src/pages/Organizations/screens/Organization/OrganizationDetail';
+import { OrganizationsAPI } from '../../../../../src/api';
+
+jest.mock('../../../../../src/api');
 
 describe('<OrganizationDetail />', () => {
   const mockDetails = {
@@ -16,6 +19,10 @@ describe('<OrganizationDetail />', () => {
     }
   };
 
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
   test('initially renders succesfully', () => {
     mountWithContexts(
       <OrganizationDetail
@@ -25,16 +32,15 @@ describe('<OrganizationDetail />', () => {
   });
 
   test('should request instance groups from api', () => {
-    const getOrganizationInstanceGroups = jest.fn();
     mountWithContexts(
       <OrganizationDetail
         organization={mockDetails}
       />, { context: {
-        network: { api: { getOrganizationInstanceGroups }, handleHttpError: () => {} }
+        network: { handleHttpError: () => {} }
       } }
     ).find('OrganizationDetail');
 
-    expect(getOrganizationInstanceGroups).toHaveBeenCalledTimes(1);
+    expect(OrganizationsAPI.readInstanceGroups).toHaveBeenCalledTimes(1);
   });
 
   test('should handle setting instance groups to state', async () => {
@@ -42,18 +48,18 @@ describe('<OrganizationDetail />', () => {
       { name: 'One', id: 1 },
       { name: 'Two', id: 2 }
     ];
-    const getOrganizationInstanceGroups = jest.fn(() => (
-      Promise.resolve({ data: { results: mockInstanceGroups } })
-    ));
+    OrganizationsAPI.readInstanceGroups.mockResolvedValue({
+      data: { results: mockInstanceGroups }
+    });
     const wrapper = mountWithContexts(
       <OrganizationDetail
         organization={mockDetails}
       />, { context: {
-        network: { api: { getOrganizationInstanceGroups }, handleHttpError: () => {} }
+        network: { handleHttpError: () => {} }
       } }
     ).find('OrganizationDetail');
 
-    await getOrganizationInstanceGroups();
+    await OrganizationsAPI.readInstanceGroups();
     expect(wrapper.state().instanceGroups).toEqual(mockInstanceGroups);
   });
 

__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx

@@ -3,6 +3,10 @@ import { mountWithContexts } from '../../../../enzymeHelpers';
 
 import OrganizationEdit from '../../../../../src/pages/Organizations/screens/Organization/OrganizationEdit';
 
+import { OrganizationsAPI } from '../../../../../src/api';
+
+jest.mock('../../../../../src/api');
+
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
 describe('<OrganizationEdit />', () => {
@@ -44,10 +48,7 @@ describe('<OrganizationEdit />', () => {
     };
     wrapper.find('OrganizationForm').prop('handleSubmit')(updatedOrgData, [], []);
 
-    expect(api.updateOrganizationDetails).toHaveBeenCalledWith(
-      1,
-      updatedOrgData
-    );
+    expect(OrganizationsAPI.update).toHaveBeenCalledWith(1, updatedOrgData);
   });
 
   test('handleSubmit associates and disassociates instance groups', async () => {
@@ -68,18 +69,9 @@ describe('<OrganizationEdit />', () => {
     wrapper.find('OrganizationForm').prop('handleSubmit')(updatedOrgData, [3, 4], [2]);
     await sleep(1);
 
-    expect(api.associateInstanceGroup).toHaveBeenCalledWith(
-      '/api/v2/organizations/1/instance_groups',
-      3
-    );
-    expect(api.associateInstanceGroup).toHaveBeenCalledWith(
-      '/api/v2/organizations/1/instance_groups',
-      4
-    );
-    expect(api.disassociate).toHaveBeenCalledWith(
-      '/api/v2/organizations/1/instance_groups',
-      2
-    );
+    expect(OrganizationsAPI.associateInstanceGroup).toHaveBeenCalledWith(1, 3);
+    expect(OrganizationsAPI.associateInstanceGroup).toHaveBeenCalledWith(1, 4);
+    expect(OrganizationsAPI.disassociateInstanceGroup).toHaveBeenCalledWith(1, 2);
   });
 
   test('should navigate to organization detail when cancel is clicked', () => {

__tests__/pages/Organizations/screens/Organization/OrganizationNotifications.test.jsx

@@ -2,10 +2,13 @@ import React from 'react';
 import { mountWithContexts } from '../../../../enzymeHelpers';
 import OrganizationNotifications from '../../../../../src/pages/Organizations/screens/Organization/OrganizationNotifications';
 import { sleep } from '../../../../testUtils';
+import { OrganizationsAPI } from '../../../../../src/api';
+
+jest.mock('../../../../../src/api');
 
 describe('<OrganizationNotifications />', () => {
   let data;
-  let network;
+  const network = {};
 
   beforeEach(() => {
     data = {
@@ -22,23 +25,13 @@ describe('<OrganizationNotifications />', () => {
         notification_type: 'email',
       }]
     };
-    network = {
-      api: {
-        getOrganizationNotifications: jest.fn()
-          .mockReturnValue(Promise.resolve({ data })),
-        getOrganizationNotificationSuccess: jest.fn()
-          .mockReturnValue(Promise.resolve({
-            data: { results: [{ id: 1 }] },
-          })),
-        getOrganizationNotificationError: jest.fn()
-          .mockReturnValue(Promise.resolve({
-            data: { results: [{ id: 2 }] },
-          })),
-        createOrganizationNotificationSuccess: jest.fn(),
-        createOrganizationNotificationError: jest.fn(),
-        toJSON: () => '/api/',
-      }
-    };
+    OrganizationsAPI.readNotificationTemplates.mockReturnValue({ data });
+    OrganizationsAPI.readNotificationTemplatesSuccess.mockReturnValue({
+      data: { results: [{ id: 1 }] },
+    });
+    OrganizationsAPI.readNotificationTemplatesError.mockReturnValue({
+      data: { results: [{ id: 2 }] },
+    });
   });
 
   afterEach(() => {
@@ -65,7 +58,7 @@ describe('<OrganizationNotifications />', () => {
     await sleep(0);
     wrapper.update();
 
-    expect(network.api.getOrganizationNotifications).toHaveBeenCalled();
+    expect(OrganizationsAPI.readNotificationTemplates).toHaveBeenCalled();
     expect(wrapper.find('OrganizationNotifications').state('notifications'))
       .toEqual(data.results);
     const items = wrapper.find('NotificationListItem');
@@ -91,7 +84,7 @@ describe('<OrganizationNotifications />', () => {
     ).toEqual([1]);
     const items = wrapper.find('NotificationListItem');
     items.at(1).find('Switch').at(0).prop('onChange')();
-    expect(network.api.createOrganizationNotificationSuccess).toHaveBeenCalled();
+    expect(OrganizationsAPI.associateNotificationTemplatesSuccess).toHaveBeenCalled();
     await sleep(0);
     wrapper.update();
     expect(
@@ -114,7 +107,7 @@ describe('<OrganizationNotifications />', () => {
     ).toEqual([2]);
     const items = wrapper.find('NotificationListItem');
     items.at(0).find('Switch').at(1).prop('onChange')();
-    expect(network.api.createOrganizationNotificationError).toHaveBeenCalled();
+    expect(OrganizationsAPI.associateNotificationTemplatesError).toHaveBeenCalled();
     await sleep(0);
     wrapper.update();
     expect(
@@ -137,7 +130,7 @@ describe('<OrganizationNotifications />', () => {
     ).toEqual([1]);
     const items = wrapper.find('NotificationListItem');
     items.at(0).find('Switch').at(0).prop('onChange')();
-    expect(network.api.createOrganizationNotificationSuccess).toHaveBeenCalled();
+    expect(OrganizationsAPI.disassociateNotificationTemplatesSuccess).toHaveBeenCalled();
     await sleep(0);
     wrapper.update();
     expect(
@@ -160,7 +153,7 @@ describe('<OrganizationNotifications />', () => {
     ).toEqual([2]);
     const items = wrapper.find('NotificationListItem');
     items.at(1).find('Switch').at(1).prop('onChange')();
-    expect(network.api.createOrganizationNotificationError).toHaveBeenCalled();
+    expect(OrganizationsAPI.disassociateNotificationTemplatesError).toHaveBeenCalled();
     await sleep(0);
     wrapper.update();
     expect(

__tests__/pages/Organizations/screens/Organization/OrganizationTeams.test.jsx

@@ -3,6 +3,9 @@ import { shallow } from 'enzyme';
 import { mountWithContexts } from '../../../../enzymeHelpers';
 import { sleep } from '../../../../testUtils';
 import OrganizationTeams, { _OrganizationTeams } from '../../../../../src/pages/Organizations/screens/Organization/OrganizationTeams';
+import { OrganizationsAPI } from '../../../../../src/api';
+
+jest.mock('../../../../../src/api');
 
 const listData = {
   data: {
@@ -17,6 +20,14 @@ const listData = {
   }
 };
 
+beforeEach(() => {
+  OrganizationsAPI.readTeams.mockResolvedValue(listData);
+});
+
+afterEach(() => {
+  jest.clearAllMocks();
+});
+
 describe('<OrganizationTeams />', () => {
   test('renders succesfully', () => {
     shallow(
@@ -24,25 +35,21 @@ describe('<OrganizationTeams />', () => {
         id={1}
         searchString=""
         location={{ search: '', pathname: '/organizations/1/teams' }}
-        api={{
-          readOrganizationTeamsList: jest.fn(),
-        }}
         handleHttpError={() => {}}
       />
     );
   });
 
   test('should load teams on mount', () => {
-    const readOrganizationTeamsList = jest.fn(() => Promise.resolve(listData));
     mountWithContexts(
       <OrganizationTeams
         id={1}
         searchString=""
       />, { context: {
-        network: { api: { readOrganizationTeamsList }, handleHttpError: () => {} } }
+        network: {} }
       }
     ).find('OrganizationTeams');
-    expect(readOrganizationTeamsList).toHaveBeenCalledWith(1, {
+    expect(OrganizationsAPI.readTeams).toHaveBeenCalledWith(1, {
       page: 1,
       page_size: 5,
       order_by: 'name',
@@ -50,13 +57,12 @@ describe('<OrganizationTeams />', () => {
   });
 
   test('should pass fetched teams to PaginatedDatalist', async () => {
-    const readOrganizationTeamsList = jest.fn(() => Promise.resolve(listData));
     const wrapper = mountWithContexts(
       <OrganizationTeams
         id={1}
         searchString=""
       />, { context: {
-        network: { api: { readOrganizationTeamsList }, handleHttpError: () => {} } }
+        network: { handleHttpError: () => {} } }
       }
     );
 

__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationAccess.test.jsx.snap

@@ -2,7 +2,6 @@
 
 exports[`<OrganizationAccess /> initially renders succesfully 1`] = `
 <OrganizationAccess
-  api={"/api/"}
   handleHttpError={[Function]}
   history={"/history/"}
   i18n={"/i18n/"}

__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationNotifications.test.jsx.snap

@@ -8,7 +8,6 @@ exports[`<OrganizationNotifications /> initially renders succesfully 1`] = `
     <Provider
       value={
         Object {
-          "api": "/api/",
           "handleHttpError": [Function],
         }
       }
@@ -18,7 +17,6 @@ exports[`<OrganizationNotifications /> initially renders succesfully 1`] = `
         value={"/config/"}
       >
         <Provider
-          api={"/api/"}
           handleHttpError={[Function]}
           i18n={"/i18n/"}
           value={"/config/"}
@@ -28,14 +26,12 @@ exports[`<OrganizationNotifications /> initially renders succesfully 1`] = `
             id={1}
           >
             <withRouter(OrganizationNotifications)
-              api={"/api/"}
               canToggleNotifications={true}
               handleHttpError={[Function]}
               id={1}
             >
               <Route>
                 <OrganizationNotifications
-                  api={"/api/"}
                   canToggleNotifications={true}
                   handleHttpError={[Function]}
                   history={"/history/"}

__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx

@@ -3,23 +3,17 @@ import React from 'react';
 import { mountWithContexts } from '../../../enzymeHelpers';
 
 import OrganizationAdd from '../../../../src/pages/Organizations/screens/OrganizationAdd';
+import { OrganizationsAPI } from '../../../../src/api';
+
+jest.mock('../../../../src/api');
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
 describe('<OrganizationAdd />', () => {
-  let api;
   let networkProviderValue;
 
   beforeEach(() => {
-    api = {
-      getInstanceGroups: jest.fn(),
-      createOrganization: jest.fn(),
-      associateInstanceGroup: jest.fn(),
-      disassociate: jest.fn(),
-    };
-
     networkProviderValue = {
-      api,
       handleHttpError: () => {}
     };
   });
@@ -34,7 +28,7 @@ describe('<OrganizationAdd />', () => {
       custom_virtualenv: 'Buzz',
     };
     wrapper.find('OrganizationForm').prop('handleSubmit')(updatedOrgData, [], []);
-    expect(api.createOrganization).toHaveBeenCalledWith(updatedOrgData);
+    expect(OrganizationsAPI.create).toHaveBeenCalledWith(updatedOrgData);
   });
 
   test('should navigate to organizations list when cancel is clicked', () => {
@@ -70,7 +64,7 @@ describe('<OrganizationAdd />', () => {
       description: 'new description',
       custom_virtualenv: 'Buzz',
     };
-    api.createOrganization.mockReturnValueOnce({
+    OrganizationsAPI.create.mockReturnValueOnce({
       data: {
         id: 5,
         related: {
@@ -96,7 +90,7 @@ describe('<OrganizationAdd />', () => {
       description: 'new description',
       custom_virtualenv: 'Buzz',
     };
-    api.createOrganization.mockReturnValueOnce({
+    OrganizationsAPI.create.mockReturnValueOnce({
       data: {
         id: 5,
         related: {
@@ -107,8 +101,8 @@ describe('<OrganizationAdd />', () => {
     });
     wrapper.find('OrganizationForm').prop('handleSubmit')(orgData, [3], []);
     await sleep(0);
-    expect(api.associateInstanceGroup)
-      .toHaveBeenCalledWith('/api/v2/organizations/5/instance_groups', 3);
+    expect(OrganizationsAPI.associateInstanceGroup)
+      .toHaveBeenCalledWith(5, 3);
   });
 
   test('AnsibleSelect component renders if there are virtual environments', () => {

__tests__/pages/Organizations/screens/OrganizationsList.test.jsx

@@ -2,6 +2,9 @@ import React from 'react';
 import { createMemoryHistory } from 'history';
 import { mountWithContexts } from '../../../enzymeHelpers';
 import OrganizationsList, { _OrganizationsList } from '../../../../src/pages/Organizations/screens/OrganizationsList';
+import { OrganizationsAPI } from '../../../../src/api';
+
+jest.mock('../../../../src/api');
 
 const mockAPIOrgsList = {
   data: {
@@ -124,7 +127,7 @@ describe('<OrganizationsList />', () => {
       selected: mockAPIOrgsList.data.results
     });
     wrapper.find('ToolbarDeleteButton').prop('onDelete')();
-    expect(api.destroyOrganization).toHaveBeenCalledTimes(component.state('selected').length);
+    expect(OrganizationsAPI.destroy).toHaveBeenCalledTimes(component.state('selected').length);
   });
 
   test('call fetchOrganizations after org(s) have been deleted', () => {