diff --git a/__tests__/components/NotificationList.test.jsx b/__tests__/components/NotificationList.test.jsx index 47ae953746..2261292ee0 100644 --- a/__tests__/components/NotificationList.test.jsx +++ b/__tests__/components/NotificationList.test.jsx @@ -11,6 +11,7 @@ describe('', () => { onReadSuccess={() => {}} onCreateError={() => {}} onCreateSuccess={() => {}} + canToggleNotifications /> ); }); @@ -24,6 +25,7 @@ describe('', () => { onReadSuccess={() => {}} onCreateError={() => {}} onCreateSuccess={() => {}} + canToggleNotifications /> ); expect(spy).toHaveBeenCalled(); @@ -38,6 +40,7 @@ describe('', () => { onReadSuccess={() => {}} onCreateError={() => {}} onCreateSuccess={() => {}} + canToggleNotifications /> ).find('Notifications'); wrapper.instance().toggleNotification(1, true, 'success'); @@ -56,6 +59,7 @@ describe('', () => { onReadSuccess={() => {}} onCreateError={() => {}} onCreateSuccess={onCreateSuccess} + canToggleNotifications /> ).find('Notifications'); wrapper.setState({ successTemplateIds: [44] }); @@ -76,6 +80,7 @@ describe('', () => { onReadSuccess={() => {}} onCreateError={() => {}} onCreateSuccess={() => {}} + canToggleNotifications /> ).find('Notifications'); wrapper.instance().toggleNotification(1, true, 'error'); @@ -94,6 +99,7 @@ describe('', () => { onReadSuccess={() => {}} onCreateError={onCreateError} onCreateSuccess={() => {}} + canToggleNotifications /> ).find('Notifications'); wrapper.setState({ errorTemplateIds: [44] }); @@ -144,6 +150,7 @@ describe('', () => { onReadSuccess={onReadSuccess} onCreateError={() => {}} onCreateSuccess={() => {}} + canToggleNotifications /> ).find('Notifications'); wrapper.instance().updateUrl = jest.fn(); diff --git a/__tests__/components/NotificationListItem.test.jsx b/__tests__/components/NotificationListItem.test.jsx index de5303c318..3ce89b72ba 100644 --- a/__tests__/components/NotificationListItem.test.jsx +++ b/__tests__/components/NotificationListItem.test.jsx @@ -20,6 +20,7 @@ describe('', () => { toggleNotification={toggleNotification} detailUrl="/foo" notificationType="slack" + canToggleNotifications /> ); expect(wrapper.length).toBe(1); @@ -33,6 +34,7 @@ describe('', () => { toggleNotification={toggleNotification} detailUrl="/foo" notificationType="slack" + canToggleNotifications /> ); wrapper.find('Switch').first().find('input').simulate('change'); @@ -47,6 +49,7 @@ describe('', () => { toggleNotification={toggleNotification} detailUrl="/foo" notificationType="slack" + canToggleNotifications /> ); wrapper.find('Switch').first().find('input').simulate('change'); @@ -61,6 +64,7 @@ describe('', () => { toggleNotification={toggleNotification} detailUrl="/foo" notificationType="slack" + canToggleNotifications /> ); wrapper.find('Switch').at(1).find('input').simulate('change'); @@ -75,6 +79,7 @@ describe('', () => { toggleNotification={toggleNotification} detailUrl="/foo" notificationType="slack" + canToggleNotifications /> ); wrapper.find('Switch').at(1).find('input').simulate('change'); diff --git a/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx b/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx index 42836b436e..88eded387a 100644 --- a/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx +++ b/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx @@ -16,13 +16,31 @@ const mockData = [ role: { name: 'foo', id: 2, + user_capabilities: { + unattach: true + } } } - ], + ] } } ]; +const organization = { + id: 1, + name: 'Default', + summary_fields: { + object_roles: {}, + user_capabilities: { + edit: true + } + } +}; + +const api = { + foo: () => {} +}; + describe('', () => { afterEach(() => { jest.restoreAllMocks(); @@ -33,6 +51,8 @@ describe('', () => { {}} removeRole={() => {}} + api={api} + organization={organization} /> ); }); @@ -42,9 +62,13 @@ describe('', () => { ({ data: { count: 1, results: mockData } })} removeRole={() => {}} + api={api} + organization={organization} /> ).find('OrganizationAccessList'); + // expect(wrapper.debug()).toBe(false); + setImmediate(() => { expect(wrapper.state().results).toEqual(mockData); done(); @@ -57,6 +81,8 @@ describe('', () => { ({ data: { count: 1, results: mockData } })} removeRole={() => {}} + api={api} + organization={organization} /> ).find('OrganizationAccessList'); expect(onSort).not.toHaveBeenCalled(); @@ -74,6 +100,8 @@ describe('', () => { ({ data: { count: 1, results: mockData } })} removeRole={() => {}} + api={api} + organization={organization} /> ).find('OrganizationAccessList'); @@ -94,6 +122,8 @@ describe('', () => { ({ data: { count: 1, results: mockData } })} removeRole={() => {}} + api={api} + organization={organization} /> ).find('OrganizationAccessList'); expect(handleWarning).not.toHaveBeenCalled(); @@ -117,6 +147,8 @@ describe('', () => { ({ data: { count: 1, results: mockData } })} removeRole={() => {}} + api={api} + organization={organization} /> ).find('OrganizationAccessList'); diff --git a/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx b/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx index 25a9da73fd..cd7e7a5dbc 100644 --- a/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx +++ b/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx @@ -3,7 +3,11 @@ import { mountWithContexts } from '../../../../enzymeHelpers'; import Organization from '../../../../../src/pages/Organizations/screens/Organization/Organization'; describe('', () => { + const me = { + is_super_user: true, + is_system_auditor: false + }; test('initially renders succesfully', () => { - mountWithContexts(); + mountWithContexts(); }); }); diff --git a/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx index fd8748d9e8..a998402345 100644 --- a/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx +++ b/__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'; describe('', () => { + const organization = { + id: 1, + name: 'Default' + }; test('initially renders succesfully', () => { - mountWithContexts(); + mountWithContexts(); }); test('passed methods as props are called appropriately', async () => { @@ -14,13 +18,14 @@ describe('', () => { const mockResponse = { status: 'success', }; - const wrapper = mountWithContexts(, { context: { network: { - api: { - getOrganizationAccessList: () => Promise.resolve(mockAPIAccessList), - disassociate: () => Promise.resolve(mockResponse) - }, - handleHttpError: () => {} - } } }).find('OrganizationAccess'); + const wrapper = mountWithContexts(, + { context: { network: { + api: { + getOrganizationAccessList: () => Promise.resolve(mockAPIAccessList), + disassociate: () => Promise.resolve(mockResponse) + }, + handleHttpError: () => {} + } } }).find('OrganizationAccess'); const accessList = await wrapper.instance().getOrgAccessList(); expect(accessList).toEqual(mockAPIAccessList); const resp = await wrapper.instance().removeRole(2, 3, 'users'); diff --git a/__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx index 177ff714b1..8636e3bce9 100644 --- a/__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx +++ b/__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx @@ -8,7 +8,12 @@ describe('', () => { description: 'Bar', custom_virtualenv: 'Fizz', created: 'Bat', - modified: 'Boo' + modified: 'Boo', + summary_fields: { + user_capabilities: { + edit: true + } + } }; test('initially renders succesfully', () => { diff --git a/__tests__/pages/Organizations/screens/Organization/OrganizationNotifications.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationNotifications.test.jsx index 560565c931..5b10cda0c9 100644 --- a/__tests__/pages/Organizations/screens/Organization/OrganizationNotifications.test.jsx +++ b/__tests__/pages/Organizations/screens/Organization/OrganizationNotifications.test.jsx @@ -18,7 +18,7 @@ describe('', () => { test('initially renders succesfully', () => { mountWithContexts( - , { context: { network: { + , { context: { network: { api, handleHttpError: () => {} } } } @@ -26,7 +26,7 @@ describe('', () => { }); test('handles api requests', () => { const wrapper = mountWithContexts( - , { context: { network: { + , { context: { network: { api, handleHttpError: () => {} } } } diff --git a/src/pages/Organizations/components/OrganizationAccessList.jsx b/src/pages/Organizations/components/OrganizationAccessList.jsx index 53b3dc4d5d..6085d31e8e 100644 --- a/src/pages/Organizations/components/OrganizationAccessList.jsx +++ b/src/pages/Organizations/components/OrganizationAccessList.jsx @@ -476,7 +476,9 @@ class OrganizationAccessList extends React.Component { } OrganizationAccessList.propTypes = { + api: PropTypes.shape().isRequired, getAccessList: PropTypes.func.isRequired, + organization: PropTypes.shape().isRequired, removeRole: PropTypes.func.isRequired };