Reorganize file locations/directory structure (#270)

Reorganize file locations

CONTRIBUTING.md

@@ -124,7 +124,7 @@ API requests can and will fail occasionally so they should include explicit erro
 
 ### App structure
 
-All source code lives in the `/src` directory and all tests live in the `/__tests__` directory (mimicing the internal structure of `/src`).
+All source code lives in the `/src` directory and all tests live in the `/testUtils` directory (mimicing the internal structure of `/src`).
 
 Inside these folders, the internal structure is:
 - **/components** - All generic components that are meant to be used in multiple contexts throughout awx.  Things like buttons, tabs go here.
@@ -251,7 +251,7 @@ this.state = {
 
 ### Testing components that use contexts
 
-We have several React contexts that wrap much of the app, including those from react-router, lingui, and some of our own. When testing a component that depends on one or more of these, you can use the `mountWithContexts()` helper function found in `__tests__/enzymeHelpers.jsx`. This can be used just like Enzyme's `mount()` function, except it will wrap the component tree with the necessary context providers and basic stub data.
+We have several React contexts that wrap much of the app, including those from react-router, lingui, and some of our own. When testing a component that depends on one or more of these, you can use the `mountWithContexts()` helper function found in `testUtils/enzymeHelpers.jsx`. This can be used just like Enzyme's `mount()` function, except it will wrap the component tree with the necessary context providers and basic stub data.
 
 If you want to stub the value of a context, or assert actions taken on it, you can customize a contexts value by passing a second parameter to `mountWithContexts`. For example, this provides a custom value for the `Config` context:
 

README.md

@@ -24,6 +24,6 @@ To run the unit tests on files that you've changed:
 * `npm test`
 
 To run a single test (in this case the login page test):
-* `npm test -- __tests__/pages/Login.test.jsx`
+* `npm test -- testUtils/pages/Login.test.jsx`
 
 **note:** Once the test watcher is up and running you can hit `a` to run all the tests

__tests__/pages/Templates/Templates.test.jsx

@@ -1,11 +0,0 @@
-import React from 'react';
-import { mountWithContexts } from '../../enzymeHelpers';
-import Templates from '../../../src/pages/Templates/Templates';
-
-describe('<Templates />', () => {
-  test('initially renders succesfully', () => {
-    mountWithContexts(
-      <Templates />
-    );
-  });
-});

jest.config.js

@@ -3,7 +3,8 @@ module.exports = {
     'src/**/*.{js,jsx}'
   ],
   coveragePathIgnorePatterns: [
-    '<rootDir>/src/locales'
+    '<rootDir>/src/locales',
+    'index.js'
   ],
   moduleNameMapper: {
     '\\.(css|scss|less)$': '<rootDir>/__mocks__/styleMock.js'

src/App.test.jsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
-import { mountWithContexts, waitForElement } from './enzymeHelpers';
+import { mountWithContexts, waitForElement } from '../testUtils/enzymeHelpers';
 import { asyncFlush } from '../jest.setup';
 
-import App from '../src/App';
+import App from './App';
-import { ConfigAPI, MeAPI, RootAPI } from '../src/api';
+import { ConfigAPI, MeAPI, RootAPI } from './api';
 
-jest.mock('../src/api');
+jest.mock('./api');
 
 describe('<App />', () => {
   const ansible_version = '111';

src/RootProvider.test.jsx

@@ -1,4 +1,4 @@
-import { getLanguage } from '../src/RootProvider';
+import { getLanguage } from './RootProvider';
 
 describe('RootProvider.jsx', () => {
   test('getLanguage returns the expected language code', () => {

src/api/Base.test.jsx

@@ -1,4 +1,4 @@
-import Base from '../../src/api/Base';
+import Base from './Base';
 
 describe('Base', () => {
   const createPromise = () => Promise.resolve();

src/api/models/Organizations.test.jsx

@@ -1,5 +1,5 @@
-import Organizations from '../../src/api/models/Organizations';
+import Organizations from './Organizations';
-import { describeNotificationMixin } from './reusable';
+import { describeNotificationMixin } from '../../../testUtils/apiReusable';
 
 describe('OrganizationsAPI', () => {
   const orgId = 1;

src/api/models/Root.test.jsx

@@ -1,4 +1,4 @@
-import Root from '../../src/api/models/Root';
+import Root from './Root';
 
 describe('RootAPI', () => {
   const createPromise = () => Promise.resolve();

src/api/models/Teams.test.jsx

@@ -1,4 +1,4 @@
-import Teams from '../../src/api/models/Teams';
+import Teams from './Teams';
 
 describe('TeamsAPI', () => {
   const teamId = 1;

src/api/models/Users.test.jsx

@@ -1,4 +1,4 @@
-import Users from '../../src/api/models/Users';
+import Users from './Users';
 
 describe('UsersAPI', () => {
   const userId = 1;

src/components/About/About.jsx

@@ -9,8 +9,8 @@ import {
   TextListItem
 } from '@patternfly/react-core';
 
-import { BrandName } from '../variables';
+import { BrandName } from '../../variables';
-import brandLogoImg from '../../images/brand-logo.svg';
+import brandLogoImg from '../../../images/brand-logo.svg';
 
 class About extends React.Component {
   static createSpeechBubble (version) {

src/components/About/About.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import About from '../../src/components/About';
+import About from './About';
 
 describe('<About />', () => {
   let aboutWrapper;

src/components/About/index.js

@@ -0,0 +1 @@
+export { default } from './About';

src/components/AddRole/AddResourceRole.test.jsx

@@ -1,10 +1,11 @@
+/* eslint-disable react/jsx-pascal-case */
 import React from 'react';
 import { shallow } from 'enzyme';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import AddResourceRole, { _AddResourceRole } from '../../src/components/AddRole/AddResourceRole';
+import AddResourceRole, { _AddResourceRole } from './AddResourceRole';
-import { TeamsAPI, UsersAPI } from '../../src/api';
+import { TeamsAPI, UsersAPI } from '../../api';
 
-jest.mock('../../src/api');
+jest.mock('../../api');
 
 describe('<_AddResourceRole />', () => {
   UsersAPI.read.mockResolvedValue({

src/components/AddRole/CheckboxCard.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import CheckboxCard from '../../src/components/AddRole/CheckboxCard';
+import CheckboxCard from './CheckboxCard';
 
 describe('<CheckboxCard />', () => {
   let wrapper;

src/components/AddRole/SelectResourceStep.jsx

@@ -5,7 +5,7 @@ import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import PaginatedDataList from '../PaginatedDataList';
 import DataListToolbar from '../DataListToolbar';
-import CheckboxListItem from '../ListItem';
+import CheckboxListItem from '../CheckboxListItem';
 import SelectedList from '../SelectedList';
 import { getQSConfig, parseNamespacedQueryString } from '../../util/qs';
 

src/components/AddRole/SelectResourceStep.test.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { createMemoryHistory } from 'history';
 import { shallow } from 'enzyme';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import { sleep } from '../testUtils';
+import { sleep } from '../../../testUtils/testUtils';
-import SelectResourceStep from '../../src/components/AddRole/SelectResourceStep';
+import SelectResourceStep from './SelectResourceStep';
 
 describe('<SelectResourceStep />', () => {
   const columns = [

src/components/AddRole/SelectRoleStep.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import SelectRoleStep from '../../src/components/AddRole/SelectRoleStep';
+import SelectRoleStep from './SelectRoleStep';
 
 describe('<SelectRoleStep />', () => {
   let wrapper;

src/components/AddRole/SelectableCard.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import SelectableCard from '../../src/components/AddRole/SelectableCard';
+import SelectableCard from './SelectableCard';
 
 describe('<SelectableCard />', () => {
   let wrapper;

src/components/AddRole/index.js

@@ -0,0 +1,5 @@
+export { default as AddResourceRole } from './AddResourceRole';
+export { default as CheckboxCard } from './CheckboxCard';
+export { default as SelectableCard } from './SelectableCard';
+export { default as SelectResourceStep } from './SelectResourceStep';
+export { default as SelectRoleStep } from './SelectRoleStep';

src/components/AlertModal/AlertModal.test.jsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import AlertModal from './AlertModal';
+
+describe('AlertModal', () => {
+  test('renders the expected content', () => {
+    const wrapper = mount(
+      <AlertModal title="Danger!" />
+    );
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/AlertModal/index.js

@@ -0,0 +1 @@
+export { default } from './AlertModal';

src/components/AnsibleSelect/AnsibleSelect.test.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import AnsibleSelect from '../../src/components/AnsibleSelect';
+import AnsibleSelect, { _AnsibleSelect } from './AnsibleSelect';
-import { _AnsibleSelect } from '../../src/components/AnsibleSelect/AnsibleSelect';
 
 const label = 'test select';
 const mockData = ['/venv/baz/', '/venv/ansible/'];

src/components/AnsibleSelect/index.js

@@ -1,3 +1 @@
-import AnsibleSelect from './AnsibleSelect';
+export { default } from './AnsibleSelect';
-
-export default AnsibleSelect;

src/components/Background/Background.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import Background from '../../src/components/Background';
+import Background from './Background';
 
 describe('Background', () => {
   test('renders the expected content', () => {

src/components/Background/index.js

@@ -0,0 +1 @@
+export { default } from './Background';

src/components/BrandLogo/BrandLogo.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import BrandLogo from '../../src/components/BrandLogo';
+import BrandLogo from './BrandLogo';
 
 let logoWrapper;
 let brandLogoElem;

src/components/BrandLogo/index.js

@@ -1,3 +1 @@
-import BrandLogo from './BrandLogo';
+export { default } from './BrandLogo';
-
-export default BrandLogo;

src/components/Breadcrumbs/Breadcrumbs.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
-import Breadcrumbs from '../../src/components/Breadcrumbs/Breadcrumbs';
+import Breadcrumbs from './Breadcrumbs';
 
 describe('<Breadcrumb />', () => {
   let breadcrumbWrapper;

src/components/Breadcrumbs/index.js

@@ -0,0 +1 @@
+export { default } from './Breadcrumbs';

src/components/CardCloseButton/CardCloseButton.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import CardCloseButton from '../../src/components/CardCloseButton';
+import CardCloseButton from './CardCloseButton';
 
 describe('<CardCloseButton>', () => {
   test('should render close button', () => {

src/components/CardCloseButton/index.js

@@ -0,0 +1 @@
+export { default } from './CardCloseButton';

src/components/CheckboxListItem/CheckboxListItem.test.jsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import CheckboxListItem from './CheckboxListItem';
+
+describe('CheckboxListItem', () => {
+  test('renders the expected content', () => {
+    const wrapper = mount(
+      <CheckboxListItem
+        itemId={1}
+        name="Buzz"
+        isSelected={false}
+        onSelect={() => {}}
+      />
+    );
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/CheckboxListItem/index.js

@@ -0,0 +1 @@
+export { default } from './CheckboxListItem';

src/components/Chip/Chip.test.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import Chip from './Chip';
+
+describe('Chip', () => {
+  test('renders the expected content', () => {
+    const wrapper = mount(<Chip />);
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/Chip/ChipGroup.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { mountWithContexts } from '../../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import { ChipGroup, Chip } from '../../../src/components/Chip';
+import { ChipGroup, Chip } from '.';
 
 describe('<ChipGroup />', () => {
   test('should render all chips', () => {

src/components/CodeMirrorInput/VariablesField.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { Formik } from 'formik';
-import { sleep } from '../../../__tests__/testUtils';
+import { sleep } from '../../../testUtils/testUtils';
 import VariablesField from './VariablesField';
 
 describe('VariablesField', () => {

src/components/ContentEmpty/ContentEmpty.test.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
+
+import ContentEmpty from './ContentEmpty';
+
+describe('ContentEmpty', () => {
+  test('renders the expected content', () => {
+    const wrapper = mountWithContexts(<ContentEmpty />);
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/ContentEmpty/index.js

@@ -0,0 +1 @@
+export { default } from './ContentEmpty';

src/components/ContentError/ContentError.test.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
+
+import ContentError from './ContentError';
+
+describe('ContentError', () => {
+  test('renders the expected content', () => {
+    const wrapper = mountWithContexts(<ContentError />);
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/ContentError/index.js

@@ -0,0 +1 @@
+export { default } from './ContentError';

src/components/ContentLoading/ContentLoading.test.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
+
+import ContentLoading from './ContentLoading';
+
+describe('ContentLoading', () => {
+  test('renders the expected content', () => {
+    const wrapper = mountWithContexts(<ContentLoading />);
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/ContentLoading/index.js

@@ -0,0 +1 @@
+export { default } from './ContentLoading';

src/components/DataListToolbar/DataListToolbar.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import DataListToolbar from '../../src/components/DataListToolbar';
+import DataListToolbar from './DataListToolbar';
 
 describe('<DataListToolbar />', () => {
   let toolbar;

src/components/DataListToolbar/index.js

@@ -1,3 +1 @@
-import DataListToolbar from './DataListToolbar';
+export { default } from './DataListToolbar';
-
-export default DataListToolbar;

src/components/DetailList/Detail.test.jsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import Detail from './Detail';
+
+describe('Detail', () => {
+  test('renders the expected content', () => {
+    const wrapper = mount(
+      <Detail label="foo" />
+    );
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/DetailList/DetailList.test.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import DetailList from './DetailList';
+
+describe('DetailList', () => {
+  test('renders the expected content', () => {
+    const wrapper = mount(<DetailList />);
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/ExpandCollapse/ExpandCollapse.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import ExpandCollapse from '../../src/components/ExpandCollapse';
+import ExpandCollapse from './ExpandCollapse';
 
 describe('<ExpandCollapse />', () => {
   const onCompact = jest.fn();

src/components/ExpandCollapse/index.js

@@ -1,3 +1 @@
-import ExpandCollapse from './ExpandCollapse';
+export { default } from './ExpandCollapse';
-
-export default ExpandCollapse;

src/components/FormActionGroup/FormActionGroup.test.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
+
+import FormActionGroup from './FormActionGroup';
+
+describe('FormActionGroup', () => {
+  test('renders the expected content', () => {
+    const wrapper = mountWithContexts(
+      <FormActionGroup
+        onSubmit={() => {}}
+        onCancel={() => {}}
+      />
+    );
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/FormActionGroup/index.js

@@ -0,0 +1 @@
+export { default } from './FormActionGroup';

src/components/FormField/FormField.jsx

@@ -11,7 +11,7 @@ function FormField (props) {
       name={name}
       validate={validate}
       render={({ field, form }) => {
-        const isValid = !form.touched[field.name] || !form.errors[field.name];
+        const isValid = form && (!form.touched[field.name] || !form.errors[field.name]);
 
         return (
           <FormGroup

src/components/FormField/index.js

@@ -0,0 +1 @@
+export { default } from './FormField';

src/components/FormRow/FormRow.test.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import FormRow from './FormRow';
+
+describe('FormRow', () => {
+  test('renders the expected content', () => {
+    const wrapper = mount(<FormRow />);
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/FormRow/index.js

@@ -0,0 +1 @@
+export { default } from './FormRow';

src/components/ListItem/index.js

@@ -1,3 +0,0 @@
-import CheckboxListItem from './CheckboxListItem';
-
-export default CheckboxListItem;

src/components/Lookup/Lookup.jsx

@@ -13,7 +13,7 @@ import { t } from '@lingui/macro';
 
 import PaginatedDataList from '../PaginatedDataList';
 import DataListToolbar from '../DataListToolbar';
-import CheckboxListItem from '../ListItem';
+import CheckboxListItem from '../CheckboxListItem';
 import SelectedList from '../SelectedList';
 import { ChipGroup, Chip } from '../Chip';
 import { getQSConfig, parseNamespacedQueryString } from '../../util/qs';

src/components/Lookup/Lookup.test.jsx

@@ -1,8 +1,8 @@
+/* eslint-disable react/jsx-pascal-case */
 import React from 'react';
 import { createMemoryHistory } from 'history';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import Lookup from '../../src/components/Lookup';
+import Lookup, { _Lookup } from './Lookup';
-import { _Lookup } from '../../src/components/Lookup/Lookup';
 
 let mockData = [{ name: 'foo', id: 1, isChecked: false }];
 const mockColumns = [

src/components/Lookup/index.js

@@ -1,3 +1 @@
-import Lookup from './Lookup';
+export { default } from './Lookup';
-
-export default Lookup;

src/components/NavExpandableGroup/NavExpandableGroup.test.jsx

@@ -3,7 +3,7 @@ import { MemoryRouter } from 'react-router-dom';
 import { mount } from 'enzyme';
 
 import { Nav } from '@patternfly/react-core';
-import NavExpandableGroup from '../../src/components/NavExpandableGroup';
+import NavExpandableGroup from './NavExpandableGroup';
 
 describe('NavExpandableGroup', () => {
   test('initialization and render', () => {

src/components/NavExpandableGroup/index.js

@@ -0,0 +1 @@
+export { default } from './NavExpandableGroup';

src/components/NotificationsList/NotificationListItem.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import NotificationListItem from '../../src/components/NotificationsList/NotificationListItem';
+import NotificationListItem from './NotificationListItem';
 
 describe('<NotificationListItem canToggleNotifications />', () => {
   let wrapper;

src/components/NotificationsList/index.js

@@ -0,0 +1 @@
+export { default } from './NotificationListItem';

src/components/PageHeaderToolbar/PageHeaderToolbar.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import PageHeaderToolbar from '../../src/components/PageHeaderToolbar';
+import PageHeaderToolbar from './PageHeaderToolbar';
 
 describe('PageHeaderToolbar', () => {
   const pageHelpDropdownSelector = 'Dropdown QuestionCircleIcon';

src/components/PageHeaderToolbar/index.js

@@ -0,0 +1 @@
+export { default } from './PageHeaderToolbar';

src/components/PaginatedDataList/PaginatedDataList.test.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { createMemoryHistory } from 'history';
-import { mountWithContexts } from '../../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import { sleep } from '../../testUtils';
+import { sleep } from '../../../testUtils/testUtils';
-import PaginatedDataList from '../../../src/components/PaginatedDataList';
+import PaginatedDataList from './PaginatedDataList';
 
 const mockData = [
   { id: 1, name: 'one', url: '/org/team/1' },

src/components/PaginatedDataList/ToolbarAddButton.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import { ToolbarAddButton } from '../../../src/components/PaginatedDataList';
+import ToolbarAddButton from './ToolbarAddButton';
 
 describe('<ToolbarAddButton />', () => {
   test('should render button', () => {

src/components/PaginatedDataList/ToolbarDeleteButton.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import { ToolbarDeleteButton } from '../../../src/components/PaginatedDataList';
+import ToolbarDeleteButton from './ToolbarDeleteButton';
 
 const itemA = {
   id: 1,

src/components/PaginatedDataList/index.js

@@ -1,6 +1,4 @@
-import PaginatedDataList from './PaginatedDataList';
+export { default } from './PaginatedDataList';
-
-export default PaginatedDataList;
 export { default as PaginatedDataListItem } from './PaginatedDataListItem';
 export { default as ToolbarDeleteButton } from './ToolbarDeleteButton';
 export { default as ToolbarAddButton } from './ToolbarAddButton';

src/components/Pagination/Pagination.test.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
+
+import Pagination from './Pagination';
+
+describe('Pagination', () => {
+  test('renders the expected content', () => {
+    const wrapper = mountWithContexts(
+      <Pagination
+        itemCount={0}
+        max={9000}
+      />
+    );
+    expect(wrapper).toHaveLength(1);
+  });
+});

src/components/Pagination/index.js

@@ -1,3 +1 @@
-import Pagination from './Pagination';
+export { default } from './Pagination';
-
-export default Pagination;

src/components/RoutedTabs/RoutedTabs.test.jsx

@@ -1,9 +1,10 @@
+/* eslint-disable react/jsx-pascal-case */
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import { Tab } from '@patternfly/react-core';
-import RoutedTabs, { _RoutedTabs } from '../../src/components/Tabs/RoutedTabs';
+import RoutedTabs, { _RoutedTabs } from './RoutedTabs';
 
 let wrapper;
 let history;

src/components/RoutedTabs/index.js

@@ -0,0 +1 @@
+export { default } from './RoutedTabs';

src/components/Search/Search.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import Search from '../../src/components/Search';
+import Search from './Search';
 
 describe('<Search />', () => {
   let search;

src/components/Search/index.js

@@ -1,3 +1 @@
-import Search from './Search';
+export { default } from './Search';
-
-export default Search;

src/components/SelectedList/SelectedList.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import SelectedList from '../../src/components/SelectedList';
+import { ChipGroup } from '../Chip';
-import { ChipGroup } from '../../src/components/Chip';
+import SelectedList from './SelectedList';
 
 describe('<SelectedList />', () => {
   test('initially renders succesfully', () => {
@@ -16,7 +16,7 @@ describe('<SelectedList />', () => {
     ];
     mount(
       <SelectedList
-        label="Selected"
+        label="Selectedeeee"
         selected={mockSelected}
         showOverflowAfter={5}
         onRemove={() => {}}

src/components/SelectedList/index.js

@@ -1,3 +1 @@
-import SelectedList from './SelectedList';
+export { default } from './SelectedList';
-
-export default SelectedList;

src/components/Sort/Sort.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../enzymeHelpers';
+import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-import Sort from '../../src/components/Sort';
+import Sort from './Sort';
 
 describe('<Sort />', () => {
   let sort;

src/components/Sort/index.js

@@ -1,3 +1 @@
-import Sort from './Sort';
+export { default } from './Sort';
-
-export default Sort;

src/components/VerticalSeparator/VerticalSeparator.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import VerticalSeparator from '../../src/components/VerticalSeparator';
+import VerticalSeparator from './VerticalSeparator';
 
 describe('VerticalSeparator', () => {
   test('renders the expected content', () => {

src/components/VerticalSeparator/index.js

@@ -1,3 +1 @@
-import VerticalSeparator from './VerticalSeparator';
+export { default } from './VerticalSeparator';
-
-export default VerticalSeparator;

src/index.jsx

@@ -20,29 +20,29 @@ import App from './App';
 import { BrandName } from './variables';
 import { isAuthenticated } from './util/auth';
 
-import Applications from './pages/Applications';
+import Applications from './screens/Application';
-import Credentials from './pages/Credentials';
+import Credentials from './screens/Credential';
-import CredentialTypes from './pages/CredentialTypes';
+import CredentialTypes from './screens/CredentialType';
-import Dashboard from './pages/Dashboard';
+import Dashboard from './screens/Dashboard';
-import InstanceGroups from './pages/InstanceGroups';
+import InstanceGroups from './screens/InstanceGroup';
-import Inventories from './pages/Inventories';
+import Inventories from './screens/Inventory';
-import InventoryScripts from './pages/InventoryScripts';
+import InventoryScripts from './screens/InventoryScript';
-import Jobs from './pages/Jobs';
+import { Jobs } from './screens/Job';
-import Login from './pages/Login';
+import Login from './screens/Login';
-import ManagementJobs from './pages/ManagementJobs';
+import ManagementJobs from './screens/ManagementJob';
-import NotificationTemplates from './pages/NotificationTemplates';
+import NotificationTemplates from './screens/NotificationTemplate';
-import Organizations from './pages/Organizations/Organizations';
+import Organizations from './screens/Organization';
-import Portal from './pages/Portal';
+import Portal from './screens/Portal';
-import Projects from './pages/Projects';
+import Projects from './screens/Project';
-import Schedules from './pages/Schedules';
+import Schedules from './screens/Schedule';
-import AuthSettings from './pages/AuthSettings';
+import AuthSettings from './screens/AuthSetting';
-import JobsSettings from './pages/JobsSettings';
+import JobsSettings from './screens/JobsSetting';
-import SystemSettings from './pages/SystemSettings';
+import SystemSettings from './screens/SystemSetting';
-import UISettings from './pages/UISettings';
+import UISettings from './screens/UISetting';
-import License from './pages/License';
+import License from './screens/License';
-import Teams from './pages/Teams';
+import Teams from './screens/Team';
-import Templates from './pages/Templates/Templates';
+import Templates from './screens/Template';
-import Users from './pages/Users';
+import Users from './screens/User';
 
 // eslint-disable-next-line import/prefer-default-export
 export function main (render) {

src/index.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
-import { main } from '../src/index';
+import { main } from './index';
 
 const render = template => mount(
   <MemoryRouter>

src/pages/Jobs/JobDetail/index.js

@@ -1,4 +0,0 @@
-import JobDetail from './JobDetail';
-
-export default JobDetail;
-

src/pages/Jobs/JobOutput/index.js

@@ -1,4 +0,0 @@
-import JobOutput from './JobOutput';
-
-export default JobOutput;
-

src/pages/Jobs/index.js

@@ -1,2 +0,0 @@
-export { default as Job } from './Job';
-export { default } from './Jobs';