diff --git a/__mocks__/fileMock.js b/__mocks__/fileMock.js new file mode 100644 index 0000000000..86059f3629 --- /dev/null +++ b/__mocks__/fileMock.js @@ -0,0 +1 @@ +module.exports = 'test-file-stub'; diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js new file mode 100644 index 0000000000..f053ebf797 --- /dev/null +++ b/__mocks__/styleMock.js @@ -0,0 +1 @@ +module.exports = {}; diff --git a/__tests__/tests/App.test.jsx b/__tests__/App.test.jsx similarity index 85% rename from __tests__/tests/App.test.jsx rename to __tests__/App.test.jsx index ef0e9fa5f0..e6c7057b88 100644 --- a/__tests__/tests/App.test.jsx +++ b/__tests__/App.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { shallow, mount } from 'enzyme'; -import App from '../../src/App'; -import api from '../../src/api'; -import Dashboard from '../../src/pages/Dashboard'; -import Login from '../../src/pages/Login'; +import App from '../src/App'; +import api from '../src/api'; +import Dashboard from '../src/pages/Dashboard'; +import Login from '../src/pages/Login'; describe('', () => { test('renders without crashing', () => { diff --git a/__tests__/tests/ConditionalRedirect.test.jsx b/__tests__/ConditionalRedirect.test.jsx similarity index 93% rename from __tests__/tests/ConditionalRedirect.test.jsx rename to __tests__/ConditionalRedirect.test.jsx index c437ae6971..f96c80bd80 100644 --- a/__tests__/tests/ConditionalRedirect.test.jsx +++ b/__tests__/ConditionalRedirect.test.jsx @@ -4,7 +4,7 @@ import { Redirect } from 'react-router-dom'; import { shallow } from 'enzyme'; -import ConditionalRedirect from '../../src/components/ConditionalRedirect'; +import ConditionalRedirect from '../src/components/ConditionalRedirect'; describe('', () => { test('renders Redirect when shouldRedirect is passed truthy func', () => { diff --git a/__tests__/tests/api.test.js b/__tests__/api.test.js similarity index 99% rename from __tests__/tests/api.test.js rename to __tests__/api.test.js index eb9136b203..5d14b20503 100644 --- a/__tests__/tests/api.test.js +++ b/__tests__/api.test.js @@ -1,6 +1,6 @@ import mockAxios from 'axios'; -import APIClient from '../../src/api'; +import APIClient from '../src/api'; const API_ROOT = '/api/'; const API_LOGIN = `${API_ROOT}login/`; diff --git a/__tests__/tests/pages/Applications.jsx b/__tests__/pages/Applications.jsx similarity index 91% rename from __tests__/tests/pages/Applications.jsx rename to __tests__/pages/Applications.jsx index 21f88674a6..f86759b04f 100644 --- a/__tests__/tests/pages/Applications.jsx +++ b/__tests__/pages/Applications.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Applications from '../../../src/pages/Applications'; +import Applications from '../../src/pages/Applications'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/AuthSettings.jsx b/__tests__/pages/AuthSettings.jsx similarity index 91% rename from __tests__/tests/pages/AuthSettings.jsx rename to __tests__/pages/AuthSettings.jsx index 84eb451938..afd11eeca5 100644 --- a/__tests__/tests/pages/AuthSettings.jsx +++ b/__tests__/pages/AuthSettings.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import AuthSettings from '../../../src/pages/AuthSettings'; +import AuthSettings from '../../src/pages/AuthSettings'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/CredentialTypes.jsx b/__tests__/pages/CredentialTypes.jsx similarity index 91% rename from __tests__/tests/pages/CredentialTypes.jsx rename to __tests__/pages/CredentialTypes.jsx index 96a46657e0..9d5f9ea3d7 100644 --- a/__tests__/tests/pages/CredentialTypes.jsx +++ b/__tests__/pages/CredentialTypes.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import CredentialTypes from '../../../src/pages/CredentialTypes'; +import CredentialTypes from '../../src/pages/CredentialTypes'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Credentials.jsx b/__tests__/pages/Credentials.jsx similarity index 92% rename from __tests__/tests/pages/Credentials.jsx rename to __tests__/pages/Credentials.jsx index 3ef7699ff7..6acf0d4dc3 100644 --- a/__tests__/tests/pages/Credentials.jsx +++ b/__tests__/pages/Credentials.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Credentials from '../../../src/pages/Credentials'; +import Credentials from '../../src/pages/Credentials'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Dashboard.jsx b/__tests__/pages/Dashboard.jsx similarity index 92% rename from __tests__/tests/pages/Dashboard.jsx rename to __tests__/pages/Dashboard.jsx index 5f73b24942..b5e9b9049a 100644 --- a/__tests__/tests/pages/Dashboard.jsx +++ b/__tests__/pages/Dashboard.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Dashboard from '../../../src/pages/Dashboard'; +import Dashboard from '../../src/pages/Dashboard'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/InstanceGroups.jsx b/__tests__/pages/InstanceGroups.jsx similarity index 91% rename from __tests__/tests/pages/InstanceGroups.jsx rename to __tests__/pages/InstanceGroups.jsx index 221c0bd1ab..a78c2ff9c2 100644 --- a/__tests__/tests/pages/InstanceGroups.jsx +++ b/__tests__/pages/InstanceGroups.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import InstanceGroups from '../../../src/pages/InstanceGroups'; +import InstanceGroups from '../../src/pages/InstanceGroups'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Inventories.jsx b/__tests__/pages/Inventories.jsx similarity index 92% rename from __tests__/tests/pages/Inventories.jsx rename to __tests__/pages/Inventories.jsx index 3be713eda5..2296fc165c 100644 --- a/__tests__/tests/pages/Inventories.jsx +++ b/__tests__/pages/Inventories.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Inventories from '../../../src/pages/Inventories'; +import Inventories from '../../src/pages/Inventories'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/InventoryScripts.jsx b/__tests__/pages/InventoryScripts.jsx similarity index 91% rename from __tests__/tests/pages/InventoryScripts.jsx rename to __tests__/pages/InventoryScripts.jsx index 0801078d3a..253f7da7e4 100644 --- a/__tests__/tests/pages/InventoryScripts.jsx +++ b/__tests__/pages/InventoryScripts.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import InventoryScripts from '../../../src/pages/InventoryScripts'; +import InventoryScripts from '../../src/pages/InventoryScripts'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Jobs.jsx b/__tests__/pages/Jobs.jsx similarity index 93% rename from __tests__/tests/pages/Jobs.jsx rename to __tests__/pages/Jobs.jsx index 88142fb517..7529c3a831 100644 --- a/__tests__/tests/pages/Jobs.jsx +++ b/__tests__/pages/Jobs.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Jobs from '../../../src/pages/Jobs'; +import Jobs from '../../src/pages/Jobs'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/JobsSettings.jsx b/__tests__/pages/JobsSettings.jsx similarity index 91% rename from __tests__/tests/pages/JobsSettings.jsx rename to __tests__/pages/JobsSettings.jsx index a86479b896..136e3a2d9f 100644 --- a/__tests__/tests/pages/JobsSettings.jsx +++ b/__tests__/pages/JobsSettings.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import JobsSettings from '../../../src/pages/JobsSettings'; +import JobsSettings from '../../src/pages/JobsSettings'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/License.jsx b/__tests__/pages/License.jsx similarity index 93% rename from __tests__/tests/pages/License.jsx rename to __tests__/pages/License.jsx index ae52e60310..3b637dd5c3 100644 --- a/__tests__/tests/pages/License.jsx +++ b/__tests__/pages/License.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import License from '../../../src/pages/License'; +import License from '../../src/pages/License'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Login.jsx b/__tests__/pages/Login.jsx similarity index 97% rename from __tests__/tests/pages/Login.jsx rename to __tests__/pages/Login.jsx index bbd3425373..63675a98ab 100644 --- a/__tests__/tests/pages/Login.jsx +++ b/__tests__/pages/Login.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { mount, shallow } from 'enzyme'; -import { asyncFlush } from '../../../jest.setup'; -import LoginPage from '../../../src/pages/Login'; -import api from '../../../src/api'; +import { asyncFlush } from '../../jest.setup'; +import LoginPage from '../../src/pages/Login'; +import api from '../../src/api'; const LOGIN_ERROR_MESSAGE = 'Invalid username or password. Please try again.'; diff --git a/__tests__/tests/pages/ManagementJobs.jsx b/__tests__/pages/ManagementJobs.jsx similarity index 91% rename from __tests__/tests/pages/ManagementJobs.jsx rename to __tests__/pages/ManagementJobs.jsx index 0d6b4214f7..0f26614b94 100644 --- a/__tests__/tests/pages/ManagementJobs.jsx +++ b/__tests__/pages/ManagementJobs.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import ManagementJobs from '../../../src/pages/ManagementJobs'; +import ManagementJobs from '../../src/pages/ManagementJobs'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/NotifcationTemplates.jsx b/__tests__/pages/NotifcationTemplates.jsx similarity index 90% rename from __tests__/tests/pages/NotifcationTemplates.jsx rename to __tests__/pages/NotifcationTemplates.jsx index 34e5e3cdcf..4603c8c85e 100644 --- a/__tests__/tests/pages/NotifcationTemplates.jsx +++ b/__tests__/pages/NotifcationTemplates.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import NotificationTemplates from '../../../src/pages/NotificationTemplates'; +import NotificationTemplates from '../../src/pages/NotificationTemplates'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Organizations.jsx b/__tests__/pages/Organizations.jsx similarity index 95% rename from __tests__/tests/pages/Organizations.jsx rename to __tests__/pages/Organizations.jsx index ac646420ec..f41b830091 100644 --- a/__tests__/tests/pages/Organizations.jsx +++ b/__tests__/pages/Organizations.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Organizations from '../../../src/pages/Organizations'; +import Organizations from '../../src/pages/Organizations'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Portal.jsx b/__tests__/pages/Portal.jsx similarity index 93% rename from __tests__/tests/pages/Portal.jsx rename to __tests__/pages/Portal.jsx index a1c3398bef..ba411fdac1 100644 --- a/__tests__/tests/pages/Portal.jsx +++ b/__tests__/pages/Portal.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Portal from '../../../src/pages/Portal'; +import Portal from '../../src/pages/Portal'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Projects.jsx b/__tests__/pages/Projects.jsx similarity index 92% rename from __tests__/tests/pages/Projects.jsx rename to __tests__/pages/Projects.jsx index a79d98b036..8ec7510325 100644 --- a/__tests__/tests/pages/Projects.jsx +++ b/__tests__/pages/Projects.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Projects from '../../../src/pages/Projects'; +import Projects from '../../src/pages/Projects'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Schedules.jsx b/__tests__/pages/Schedules.jsx similarity index 92% rename from __tests__/tests/pages/Schedules.jsx rename to __tests__/pages/Schedules.jsx index b9b8ccf6d3..a144c5e985 100644 --- a/__tests__/tests/pages/Schedules.jsx +++ b/__tests__/pages/Schedules.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Schedules from '../../../src/pages/Schedules'; +import Schedules from '../../src/pages/Schedules'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/SystemSettings.jsx b/__tests__/pages/SystemSettings.jsx similarity index 91% rename from __tests__/tests/pages/SystemSettings.jsx rename to __tests__/pages/SystemSettings.jsx index 6539032606..cc86976a52 100644 --- a/__tests__/tests/pages/SystemSettings.jsx +++ b/__tests__/pages/SystemSettings.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import SystemSettings from '../../../src/pages/SystemSettings'; +import SystemSettings from '../../src/pages/SystemSettings'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Teams.jsx b/__tests__/pages/Teams.jsx similarity index 93% rename from __tests__/tests/pages/Teams.jsx rename to __tests__/pages/Teams.jsx index 9d7c7e247a..80f52cbc69 100644 --- a/__tests__/tests/pages/Teams.jsx +++ b/__tests__/pages/Teams.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Teams from '../../../src/pages/Teams'; +import Teams from '../../src/pages/Teams'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Templates.jsx b/__tests__/pages/Templates.jsx similarity index 92% rename from __tests__/tests/pages/Templates.jsx rename to __tests__/pages/Templates.jsx index 42090f5a6b..2a3f4ef869 100644 --- a/__tests__/tests/pages/Templates.jsx +++ b/__tests__/pages/Templates.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Templates from '../../../src/pages/Templates'; +import Templates from '../../src/pages/Templates'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/UISettings.jsx b/__tests__/pages/UISettings.jsx similarity index 92% rename from __tests__/tests/pages/UISettings.jsx rename to __tests__/pages/UISettings.jsx index 57fcd8133c..3d6c6c88d2 100644 --- a/__tests__/tests/pages/UISettings.jsx +++ b/__tests__/pages/UISettings.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import UISettings from '../../../src/pages/UISettings'; +import UISettings from '../../src/pages/UISettings'; describe('', () => { let pageWrapper; diff --git a/__tests__/tests/pages/Users.jsx b/__tests__/pages/Users.jsx similarity index 93% rename from __tests__/tests/pages/Users.jsx rename to __tests__/pages/Users.jsx index 642d303185..48199690a9 100644 --- a/__tests__/tests/pages/Users.jsx +++ b/__tests__/pages/Users.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Users from '../../../src/pages/Users'; +import Users from '../../src/pages/Users'; describe('', () => { let pageWrapper; diff --git a/__tests__/stubs/svgStub.js b/__tests__/stubs/svgStub.js deleted file mode 100644 index 71adc36fed..0000000000 --- a/__tests__/stubs/svgStub.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 'svg-stub'; diff --git a/jest.config.js b/jest.config.js index 7d257967bf..cf3d1a6f92 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,11 +3,12 @@ module.exports = { 'src/**/*.{js,jsx}' ], moduleNameMapper: { - '^[./a-zA-Z0-9$_-]+\\.svg$': '/__tests__/stubs/svgStub.js' + '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/__mocks__/fileMock.js', + '\\.(css|scss|less)$': '/__mocks__/styleMock.js' }, setupTestFrameworkScriptFile: '/jest.setup.js', testMatch: [ - '/__tests__/tests/**/*.{js,jsx}' + '/__tests__/**/*.{js,jsx}' ], testEnvironment: 'jsdom', testURL: 'http://127.0.0.1:3001',