From f71421f60ab63da3bec31328d13e0d8c398be41a Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Tue, 30 Apr 2019 10:22:25 -0400 Subject: [PATCH] removed orgsToDelete and fixed other tests --- .../screens/OrganizationsList.test.jsx | 17 +++++++++-------- .../Organizations/screens/OrganizationsList.jsx | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/__tests__/pages/Organizations/screens/OrganizationsList.test.jsx b/__tests__/pages/Organizations/screens/OrganizationsList.test.jsx index 410a521aa6..1262c36db8 100644 --- a/__tests__/pages/Organizations/screens/OrganizationsList.test.jsx +++ b/__tests__/pages/Organizations/screens/OrganizationsList.test.jsx @@ -56,7 +56,7 @@ describe('<_OrganizationsList />', () => { beforeEach(() => { api = { - getOrganizations: jest.fn(), + getOrganizations: () => {}, destroyOrganization: jest.fn(), }; }); @@ -76,6 +76,7 @@ describe('<_OrganizationsList />', () => { results: mockAPIOrgsList.data.results }); wrapper.update(); + expect(wrapper.state('selected').length).toBe(0); wrapper.instance().onSelect(mockAPIOrgsList.data.results.slice(0, 1)); expect(wrapper.state('selected').length).toBe(1); }); @@ -87,12 +88,12 @@ describe('<_OrganizationsList />', () => { wrapper.setState( mockAPIOrgsList.data ); - wrapper.find({ type: 'checkbox' }).simulate('click'); + expect(wrapper.state('selected').length).toBe(0); wrapper.instance().onSelectAll(true); expect(wrapper.find('OrganizationsList').state().selected.length).toEqual(wrapper.state().results.length); }); - test('orgsToDelete is 0 when close modal button is clicked.', () => { + test('selected is > 0 when close modal button is clicked.', () => { wrapper = mountWithContexts( ); @@ -108,11 +109,11 @@ describe('<_OrganizationsList />', () => { button.prop('onClose')(); wrapper.update(); expect(component.state('isModalOpen')).toBe(false); - expect(component.state('selected').length).toBe(0); + expect(component.state('selected').length).toBeGreaterThan(0); wrapper.unmount(); }); - test('orgsToDelete is 0 when cancel modal button is clicked.', () => { + test('selected is > 0 when cancel modal button is clicked.', () => { wrapper = mountWithContexts( ); @@ -128,11 +129,11 @@ describe('<_OrganizationsList />', () => { button.prop('onClick')(); wrapper.update(); expect(component.state('isModalOpen')).toBe(false); - expect(component.state('selected').length).toBe(0); + expect(component.state('selected').length).toBeGreaterThan(0); wrapper.unmount(); }); - test('api is called to delete Orgs for each org in orgsToDelete.', () => { + test('api is called to delete Orgs for each org in selected.', () => { const fetchOrganizations = jest.fn(() => wrapper.find('OrganizationsList').setState({ results: [] })); @@ -154,7 +155,7 @@ describe('<_OrganizationsList />', () => { const button = wrapper.find('ModalBoxFooter').find('button').at(0); button.simulate('click'); wrapper.update(); - expect(api.destroyOrganization).toHaveBeenCalledTimes(component.state('results').length); + expect(api.destroyOrganization).toHaveBeenCalledTimes(component.state('selected').length); }); test('call fetchOrganizations after org(s) have been deleted', () => { diff --git a/src/pages/Organizations/screens/OrganizationsList.jsx b/src/pages/Organizations/screens/OrganizationsList.jsx index fba7a5b790..721b545e95 100644 --- a/src/pages/Organizations/screens/OrganizationsList.jsx +++ b/src/pages/Organizations/screens/OrganizationsList.jsx @@ -146,7 +146,6 @@ class OrganizationsList extends Component { handleClearOrgDeleteModal () { this.setState({ isModalOpen: false, - selected: [] }); }