diff --git a/jest.config.js b/jest.config.js index 0503ae19230..07f758c2c46 100644 --- a/jest.config.js +++ b/jest.config.js @@ -5,6 +5,8 @@ const foremanReactFull = foremanRelativePath(foremanReactRelative); // Jest configuration module.exports = { + logHeapUsage: true, + maxWorkers: 2, testURL: 'http://localhost/', setupFiles: [ './webpack/test_setup.js', diff --git a/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js b/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js index 80c7aa46a60..0f4f514ba3e 100644 --- a/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js +++ b/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js @@ -1,11 +1,10 @@ import React from 'react'; import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper'; -import nock, { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper'; +import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper'; import { foremanApi } from '../../../../../services/api'; import { HOST_ERRATA_KEY } from '../../HostErrata/HostErrataConstants'; import { ErrataTab } from '../ErrataTab'; - -const mockErrataData = require('./errata.fixtures.json'); +import mockErrataData from './errata.fixtures.json'; const renderOptions = { apiNamespace: HOST_ERRATA_KEY, @@ -57,6 +56,7 @@ let searchDelayScope; let autoSearchScope; beforeEach(() => { + // jest.resetModules(); const { results } = mockErrataData; [firstErrata] = results; searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500); @@ -64,7 +64,6 @@ beforeEach(() => { }); afterEach(() => { - nock.cleanAll(); assertNockRequest(searchDelayScope); assertNockRequest(autoSearchScope); }); diff --git a/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js b/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js index 9a043951946..b274df45eab 100644 --- a/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js +++ b/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js @@ -4,11 +4,10 @@ import nock, { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSet import { foremanApi } from '../../../../../services/api'; import { HOST_TRACES_KEY } from '../HostTracesConstants'; import TracesTab from '../TracesTab'; - -const mockTraceData = require('./traces.fixtures.json'); -const mockResolveTraceTask = require('./resolveTraces.fixtures.json'); -const emptyTraceResults = require('./tracerEmptyTraceResults.fixtures.json'); -const mockJobInvocationStatus = require('./tracerEnableJobInvocation.fixtures.json'); +import mockTraceData from './traces.fixtures.json'; +import mockResolveTraceTask from './resolveTraces.fixtures.json'; +import emptyTraceResults from './tracerEmptyTraceResults.fixtures.json'; +import mockJobInvocationStatus from './tracerEnableJobInvocation.fixtures.json'; const tracerInstalledResponse = { id: 1, diff --git a/webpack/global_test_setup.js b/webpack/global_test_setup.js index 060dd4b6e28..d7f6bc16344 100644 --- a/webpack/global_test_setup.js +++ b/webpack/global_test_setup.js @@ -9,3 +9,8 @@ global.console.error = (error, stack) => { // Increase jest timeout as some tests using multiple http mocks can time out on CI systems. jest.setTimeout(300000); + +afterAll(() => { + jest.resetModules(); + if (global.gc) global.gc(); +}); diff --git a/webpack/scenes/Content/Details/__tests__/contentDetail.test.js b/webpack/scenes/Content/Details/__tests__/contentDetail.test.js index 9f95eeb7204..206592c06ea 100644 --- a/webpack/scenes/Content/Details/__tests__/contentDetail.test.js +++ b/webpack/scenes/Content/Details/__tests__/contentDetail.test.js @@ -6,9 +6,8 @@ import api from '../../../../services/api'; import { CONTENT_ID_KEY } from '../../ContentConstants'; import ContentDetails from '../ContentDetails'; import ContentRepositories from '../ContentRepositories'; - -const pythonPackageDetailsResponse = require('./pythonPackageDetails.fixtures.json'); -const pythonPackageRepositoryDetailsResponse = require('./pythonPackageRepositoryDetails.fixtures.json'); +import pythonPackageDetailsResponse from './pythonPackageDetails.fixtures.json'; +import pythonPackageRepositoryDetailsResponse from './pythonPackageRepositoryDetails.fixtures.json'; const pythonPackageDetailsPath = api.getApiUrl('/python_packages/1491'); const pythonPackageRepositoryDetailsPath = api.getApiUrl('/repositories'); diff --git a/webpack/scenes/Content/__tests__/contentTable.test.js b/webpack/scenes/Content/__tests__/contentTable.test.js index e7cac9a7e20..21b8acbb885 100644 --- a/webpack/scenes/Content/__tests__/contentTable.test.js +++ b/webpack/scenes/Content/__tests__/contentTable.test.js @@ -3,9 +3,8 @@ import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper'; import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../test-utils/nockWrapper'; import api from '../../../services/api'; import ContentPage from '../ContentPage'; - -const contentTypesResponse = require('./contentTypes.fixtures.json'); -const pythonPackagesResponse = require('./pythonPackages.fixtures.json'); +import contentTypesResponse from './contentTypes.fixtures.json'; +import pythonPackagesResponse from './pythonPackages.fixtures.json'; const contentTypesPath = api.getApiUrl('/repositories/content_types'); const pythonPackagesPath = api.getApiUrl('/python_packages'); diff --git a/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js b/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js index b881ae9a3c0..44ecbe6cfff 100644 --- a/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js +++ b/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js @@ -5,7 +5,7 @@ import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrap import api from '../../../../services/api'; import CopyContentViewForm from '../CopyContentViewForm'; -const cvCopyData = require('./contentViewCopyResult.fixtures.json'); +import cvCopyData from './contentViewCopyResult.fixtures.json'; const cvId = '1'; const cvCopyPath = api.getApiUrl(`/content_views/${cvId}/copy`); diff --git a/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js b/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js index fc5a6862223..07651b826a6 100644 --- a/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js +++ b/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js @@ -4,8 +4,7 @@ import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib- import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper'; import api from '../../../../services/api'; import CreateContentViewForm from '../CreateContentViewForm'; - -const cvCreateData = require('./contentViewCreateResult.fixtures.json'); +import cvCreateData from './contentViewCreateResult.fixtures.json'; const cvCreatePath = api.getApiUrl('/content_views'); diff --git a/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js b/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js index c065bbb6c76..a61fb235731 100644 --- a/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js +++ b/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js @@ -7,32 +7,31 @@ import nock, { } from '../../../../test-utils/nockWrapper'; import CONTENT_VIEWS_KEY from '../../ContentViewsConstants'; import ContentViewsPage from '../../ContentViewsPage.js'; - -const cvIndexData = require('./CvData.fixtures'); +import cvIndexData from './CvData.fixtures.json'; +import environmentPathsData from './envPathData.fixtures.json'; +import cvVersionsData from './cvVersionsData.fixtures.json'; +import cvDetailsData from './cvDetails.fixtures.json'; +import affectedActivationKeysData from '../../Details/Versions/Delete/__tests__/cvAffectedActivationKeys.fixture.json'; +import affectedHostData from './affectedHosts.fixtures.json'; +import cVDropDownOptionsData from '../../Details/Versions/Delete/__tests__/cvDropDownOptionsResponse.fixture.json'; +import cvDeleteResponse from '../../Details/Versions/Delete/__tests__/cvVersionRemoveResponse.fixture.json'; const cvIndexPath = api.getApiUrl('/content_views?organization_id=1&nondefault=true&include_permissions=true&per_page=20&page=1'); const autocompleteUrl = '/content_views/auto_complete_search'; const renderOptions = { apiNamespace: CONTENT_VIEWS_KEY }; const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths'); -const environmentPathsData = require('./envPathData.fixtures.json'); const cvVersionsPath = api.getApiUrl('/content_view_versions'); -const cvVersionsData = require('./cvVersionsData.fixtures.json'); const cvDetailsPath = api.getApiUrl('/content_views/20'); -const cvDetailsData = require('./cvDetails.fixtures.json'); const activationKeyURL = api.getApiUrl('/activation_keys'); -const affectedActivationKeysData = require('../../Details/Versions/Delete/__tests__/cvAffectedActivationKeys.fixture.json'); const hostURL = foremanApi.getApiUrl('/hosts'); -const affectedHostData = require('./affectedHosts.fixtures.json'); const cVDropDownOptionsPath = api.getApiUrl('/content_views?organization_id=1&environment_id=9&include_default=true&include_permissions=true&full_result=true'); -const cVDropDownOptionsData = require('../../Details/Versions/Delete/__tests__/cvDropDownOptionsResponse.fixture.json'); const cvDeleteUrl = api.getApiUrl('/content_views/20/remove'); -const cvDeleteResponse = require('../../Details/Versions/Delete/__tests__/cvVersionRemoveResponse.fixture'); let firstCV; diff --git a/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js b/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js index d5b5c767c85..ce9ce5b84a0 100644 --- a/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +++ b/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js @@ -4,11 +4,10 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } import api from '../../../../../services/api'; import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants'; import ContentViewComponents from '../ContentViewComponents'; - -const cvComponentData = require('./contentViewComponents.fixtures.json'); -const cvUnpublishedComponentData = require('./unpublishedCVComponents.fixtures.json'); -const cvPublishedComponentData = require('./publishedContentViewDetails.fixtures.json'); -const cvDetails = require('../../__tests__/contentViewDetails.fixtures.json'); +import cvComponentData from './contentViewComponents.fixtures.json'; +import cvUnpublishedComponentData from './unpublishedCVComponents.fixtures.json'; +import cvPublishedComponentData from './publishedContentViewDetails.fixtures.json'; +import cvDetails from '../../__tests__/contentViewDetails.fixtures.json'; const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` }; const cvComponentsWithoutSearch = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&status=All'); diff --git a/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js b/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js index c94bfa9748e..82023ef9c3c 100644 --- a/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js @@ -5,8 +5,7 @@ import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib- import api from '../../../../../../services/api'; import CVFilterAddModal from '../CVFilterAddModal'; import { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper'; - -const cvCreateData = require('./cvFilterCreateResult.fixtures.json'); +import cvCreateData from './cvFilterCreateResult.fixtures.json'; const cvCreateFilterPath = api.getApiUrl('/content_view_filters?content_view_id=5'); diff --git a/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js b/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js index 55b7e89eea6..89a2f598078 100644 --- a/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js @@ -6,8 +6,8 @@ import api from '../../../../../../services/api'; import CVRpmMatchContentModal from '../CVRpmMatchContentModal'; import nock, { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper'; -const CVMatchedContent = require('./CVRpmMatchContent.fixtures.json'); -const CVMatchContentSearch = require('./CVRpmMatchContentSearch.fixtures.json'); +import CVMatchedContent from './CVRpmMatchContent.fixtures.json'; +import CVMatchContentSearch from './CVRpmMatchContentSearch.fixtures.json'; const firstMatchContent = CVMatchedContent.results[0]; const { nvra: secondMatchContentName } = CVMatchedContent.results[1]; diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js index 68e1a9f6e6e..6b339678c67 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js @@ -11,9 +11,8 @@ import nock, { } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; import CVContainerImageFilterContent from '../CVContainerImageFilterContent'; - -const cvFilterFixtures = require('./CVContainerImageFilterContent.fixtures.json'); -const details = require('../../../../ContentViews/__tests__/mockDetails.fixtures.json'); +import cvFilterFixtures from './CVContainerImageFilterContent.fixtures.json'; +import details from '../../../../ContentViews/__tests__/mockDetails.fixtures.json'; const afterDeleteFilterResultsArray = [...cvFilterFixtures.results]; afterDeleteFilterResultsArray.shift(); diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js index c7cdbd3dcf4..e0e024424de 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js @@ -11,11 +11,10 @@ import nock, { mockSetting, } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; - -const cvFilterDetails = require('./cvPackageFilterDetail.fixtures.json'); -const cvPackageFilterRules = require('./cvPackageFilterRules.fixtures.json'); -const cvFilterFixtures = require('./contentViewFilters.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); +import cvFilterDetails from './cvPackageFilterDetail.fixtures.json'; +import cvPackageFilterRules from './cvPackageFilterRules.fixtures.json'; +import cvFilterFixtures from './contentViewFilters.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const cvFiltersPath = api.getApiUrl('/content_view_filters'); const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/2'); diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js index 7e65e9bd106..60c98445338 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js @@ -12,12 +12,12 @@ import nock, { } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; -const allPackageGroups = require('./allFilterPackageGroups.fixtures.json'); -const cvFilterDetails = require('./contentViewFilterDetail.fixtures.json'); -const cvFilterDetailsAffectedRepos = require('./cvFilterDetailWithAffectedRepos.fixtures.json'); -const cvFilterFixtures = require('./contentViewFilters.fixtures.json'); -const cvAllRepos = require('./cvAllRepos.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); +import allPackageGroups from './allFilterPackageGroups.fixtures.json'; +import cvFilterDetails from './contentViewFilterDetail.fixtures.json'; +import cvFilterDetailsAffectedRepos from './cvFilterDetailWithAffectedRepos.fixtures.json'; +import cvFilterFixtures from './contentViewFilters.fixtures.json'; +import cvAllRepos from './cvAllRepos.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const cvRefreshCallbackPath = api.getApiUrl('/content_views/1'); const cvFiltersPath = api.getApiUrl('/content_view_filters'); diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js index 68fa7204b50..46b7f0d5b9d 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js @@ -11,11 +11,10 @@ import nock, { mockSetting, } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; - -const allPackageGroups = require('./allFilterPackageGroups.fixtures.json'); -const cvFilterDetails = require('./contentViewFilterDetail.fixtures.json'); -const cvFilterFixtures = require('./contentViewFilters.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); +import allPackageGroups from './allFilterPackageGroups.fixtures.json'; +import cvFilterDetails from './contentViewFilterDetail.fixtures.json'; +import cvFilterFixtures from './contentViewFilters.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const cvFiltersPath = api.getApiUrl('/content_view_filters'); const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/1'); diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js index 01f3d7019c1..1ce9e2ceac0 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js @@ -6,6 +6,8 @@ import api from '../../../../../services/api'; import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper'; import ContentViewFilters from '../ContentViewFilters'; import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants'; +import cvFilterFixtures from './contentViewFilters.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const withCVRoute = component => {component}; @@ -18,8 +20,6 @@ const renderOptions = { }, }; -const cvFilterFixtures = require('./contentViewFilters.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); const cvFilters = api.getApiUrl('/content_view_filters'); const autocompleteUrl = '/content_view_filters/auto_complete_search'; diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js index b8461f00a97..cbcfb176fae 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js @@ -7,9 +7,8 @@ import { } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; import CVErrataDateFilterContent from '../CVErrataDateFilterContent'; - -const cvFilterDetails = require('./contentViewErrataByDateDetails.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); +import cvFilterDetails from './contentViewErrataByDateDetails.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/36'); diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js index bf4bb80a5ae..ad4dd25b08e 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js @@ -11,11 +11,10 @@ import nock, { mockSetting, } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; - -const allErrata = require('./allFilterErrata.fixtures.json'); -const cvFilterDetails = require('./cvErratumFilterDetails.fixtures.json'); -const cvFilterFixtures = require('./contentViewFilters.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); +import allErrata from './allFilterErrata.fixtures.json'; +import cvFilterDetails from './cvErratumFilterDetails.fixtures.json'; +import cvFilterFixtures from './contentViewFilters.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const cvFiltersPath = api.getApiUrl('/content_view_filters'); const cvRefreshCallbackPath = api.getApiUrl('/content_views/1'); diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js index 0080b441a89..e9d2663ffb3 100644 --- a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js +++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js @@ -11,11 +11,10 @@ import nock, { mockSetting, } from '../../../../../test-utils/nockWrapper'; import api from '../../../../../services/api'; - -const allModuleStreams = require('./allFilterModulesStreams.fixtures.json'); -const cvFilterDetails = require('./cvModuleStreamFilterDetails.fixtures.json'); -const cvFilterFixtures = require('./contentViewFilters.fixtures.json'); -const details = require('../../../__tests__/mockDetails.fixtures.json'); +import allModuleStreams from './allFilterModulesStreams.fixtures.json'; +import cvFilterDetails from './cvModuleStreamFilterDetails.fixtures.json'; +import cvFilterFixtures from './contentViewFilters.fixtures.json'; +import details from '../../../__tests__/mockDetails.fixtures.json'; const cvFiltersPath = api.getApiUrl('/content_view_filters'); const cvRefreshCallbackPath = api.getApiUrl('/content_views/1'); diff --git a/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js b/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js index f14478e528b..49f1a8ef779 100644 --- a/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js +++ b/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js @@ -5,8 +5,7 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } import api from '../../../../../services/api'; import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants'; import ContentViewHistories from '../ContentViewHistories'; - -const historyData = require('./contentViewHistory.fixtures.json'); +import historyData from './contentViewHistory.fixtures.json'; const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` }; const cvHistories = api.getApiUrl('/content_views/1/history'); diff --git a/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js b/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js index fee208924f5..a0217f5fd2c 100644 --- a/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +++ b/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js @@ -5,17 +5,16 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } import api from '../../../../../services/api'; import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants'; import ContentViewRepositories from '../ContentViewRepositories'; - -const repoData = require('./contentViewDetailRepos.fixtures.json'); +import repoData from './contentViewDetailRepos.fixtures.json'; +import cvDetailData from '../../__tests__/contentViewDetails.fixtures.json'; +import cvRepoAddData from './contentViewRepoAdd.fixture.json'; const autocompleteUrl = '/repositories/auto_complete_search'; const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` }; const cvAllRepos = api.getApiUrl('/content_views/1/repositories/show_all'); const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }, { name: 'ostree' }, { name: 'yum' }]; -const cvDetailData = require('../../__tests__/contentViewDetails.fixtures.json'); const cvDetailsPath = api.getApiUrl('/content_views/1'); -const cvRepoAddData = require('./contentViewRepoAdd.fixture.json'); let firstRepo; let searchDelayScope; diff --git a/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js b/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js index e501d0d3a97..f7398a5b2be 100644 --- a/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js +++ b/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js @@ -4,27 +4,26 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockForemanAut import api, { foremanApi } from '../../../../../../services/api'; import CONTENT_VIEWS_KEY from '../../../../ContentViewsConstants'; import ContentViewVersions from '../../ContentViewVersions'; - -const cvVersionsData = require('./versionsResponseData.fixtures.json'); +import cvVersionsData from './versionsResponseData.fixtures.json'; +import environmentPathsData from './versionRemoveEnvPaths.fixtures'; +import cvVersionRemoveResponse from './cvVersionRemoveResponse.fixture.json'; +import cvDetailData from '../../../../__tests__/mockDetails.fixtures.json'; +import affectedHostData from './cvAffectedHosts.fixture'; +import affectedActivationKeysData from './cvAffectedActivationKeys.fixture.json'; +import cVDropDownOptionsData from './cvDropDownOptionsResponse.fixture'; const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths'); -const environmentPathsData = require('./versionRemoveEnvPaths.fixtures'); const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_2` }; const cvVersions = api.getApiUrl('/content_view_versions'); const autocompleteUrl = '/content_view_versions/auto_complete_search'; const cvVersionRemoveUrl = api.getApiUrl('/content_views/2/remove'); -const cvVersionRemoveResponse = require('./cvVersionRemoveResponse.fixture.json'); -const cvDetailData = require('../../../../__tests__/mockDetails.fixtures.json'); const hostURL = foremanApi.getApiUrl('/hosts'); -const affectedHostData = require('./cvAffectedHosts.fixture'); const activationKeyURL = api.getApiUrl('/activation_keys'); -const affectedActivationKeysData = require('./cvAffectedActivationKeys.fixture.json'); const cVDropDownOptionsPath = api.getApiUrl('/content_views?organization_id=1&include_permissions=true&environment_id=3&include_default=true&full_result=true'); -const cVDropDownOptionsData = require('./cvDropDownOptionsResponse.fixture'); // const taskPollingUrl = '/foreman_tasks/api/tasks/6b900ff8-62bb-42ac-8c45-da86b7258520'; let firstVersion; diff --git a/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js b/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js index 9d4a8035d9d..dfc4adcbf21 100644 --- a/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js +++ b/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js @@ -7,11 +7,19 @@ import api from '../../../../../../services/api'; import { cvVersionDetailsKey } from '../../../../ContentViewsConstants'; import ContentViewVersionDetails from '../ContentViewVersionDetails'; import { AUTOSEARCH_DELAY, AUTOSEARCH_WHILE_TYPING } from '../../../../../Settings/SettingsConstants'; - - -const ContentViewVersionDetailsData = require('./ContentViewVersionDetails.fixtures.json'); -const ContentViewVersionDetailsCounts = require('./ContentViewVersionDetailsCounts.fixtures.json'); -const cvDetailData = require('../../../../__tests__/mockDetails.fixtures.json'); +import ContentViewVersionDetailsData from './ContentViewVersionDetails.fixtures.json'; +import ContentViewVersionDetailsCounts from './ContentViewVersionDetailsCounts.fixtures.json'; +import cvDetailData from '../../../../__tests__/mockDetails.fixtures.json'; +import ContentViewVersionsComponentData from './ContentViewVersionComponent.fixtures.json'; +import ContentViewVersionsRepositoriesData from './ContentViewVersionRepositories.fixtures.json'; +import ContentViewVersionRpmPackagesData from './ContentViewVersionRpmPackages.fixtures.json'; +import ContentViewVersionRpmPackageGroupsData from './ContentViewVersionRpmPackageGroups.fixtures.json'; +import ContentViewVersionFilesData from './ContentViewVersionFiles.fixtures.json'; +import ContentViewVersionErrataData from './ContentViewVersionErrata.fixtures.json'; +import ContentViewVersionModuleStreamsData from './ContentViewVersionModuleStreams.fixtures.json'; +import ContentViewVersionDebPackagesData from './ContentViewVersionDebPackages.fixtures.json'; +import ContentViewVersionAnsibleCollectionsData from './ContentViewVersionAnsibleCollections.fixtures.json'; +import ContentViewVersionDockerTagsData from './ContentViewVersionDockerTags.fixtures.json'; // This changes the api count value so that only the specified tab will show. const getTabSpecificData = key => ({ @@ -19,18 +27,6 @@ const getTabSpecificData = key => ({ [key]: ContentViewVersionDetailsCounts[key], }); -// Tab Fixtures -const ContentViewVersionsComponentData = require('./ContentViewVersionComponent.fixtures.json'); -const ContentViewVersionsRepositoriesData = require('./ContentViewVersionRepositories.fixtures.json'); -const ContentViewVersionRpmPackagesData = require('./ContentViewVersionRpmPackages.fixtures.json'); -const ContentViewVersionRpmPackageGroupsData = require('./ContentViewVersionRpmPackageGroups.fixtures.json'); -const ContentViewVersionFilesData = require('./ContentViewVersionFiles.fixtures.json'); -const ContentViewVersionErrataData = require('./ContentViewVersionErrata.fixtures.json'); -const ContentViewVersionModuleStreamsData = require('./ContentViewVersionModuleStreams.fixtures.json'); -const ContentViewVersionDebPackagesData = require('./ContentViewVersionDebPackages.fixtures.json'); -const ContentViewVersionAnsibleCollectionsData = require('./ContentViewVersionAnsibleCollections.fixtures.json'); -const ContentViewVersionDockerTagsData = require('./ContentViewVersionDockerTags.fixtures.json'); - const withCVRoute = component => {component}; const cvVersions = api.getApiUrl('/content_view_versions/73'); diff --git a/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js b/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js index 7f930c7755b..e064d8edaa0 100644 --- a/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js +++ b/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js @@ -6,9 +6,8 @@ import { nockInstance, assertNockRequest } from '../../../../../../test-utils/no import api from '../../../../../../services/api'; import { cvVersionDetailsKey } from '../../../../ContentViewsConstants'; import ContentViewVersionDetails from '../ContentViewVersionDetails'; - -const ContentViewVersionDetailsEmptyData = require('./ContentViewVersionDetails.fixtures.json'); -const cvDetailData = require('../../../../__tests__/mockDetails.fixtures.json'); +import ContentViewVersionDetailsEmptyData from './ContentViewVersionDetails.fixtures.json'; +import cvDetailData from '../../../../__tests__/mockDetails.fixtures.json'; const withCVRoute = component => {component}; diff --git a/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js b/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js index 6b29b3f0f12..769f1f392a7 100644 --- a/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +++ b/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js @@ -5,20 +5,19 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } import api from '../../../../../services/api'; import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants'; import ContentViewVersions from '../ContentViewVersions'; - -const cvVersionsData = require('./contentViewVersions.fixtures.json'); -const emptyCVVersionData = require('./emptyCVVersion.fixtures.json'); -const cvVersionsTasksData = require('./contentViewVersionsWithTask.fixtures.json'); -const contentViewTaskInProgressResponseData = require('./contentViewTaskInProgressResponse.fixtures.json'); -const contentViewTaskResponseData = require('./contentViewTaskResponse.fixtures.json'); -const cvDetailData = require('../../../../ContentViews/__tests__/mockDetails.fixtures.json'); +import cvVersionsData from './contentViewVersions.fixtures.json'; +import emptyCVVersionData from './emptyCVVersion.fixtures.json'; +import cvVersionsTasksData from './contentViewVersionsWithTask.fixtures.json'; +import contentViewTaskInProgressResponseData from './contentViewTaskInProgressResponse.fixtures.json'; +import contentViewTaskResponseData from './contentViewTaskResponse.fixtures.json'; +import cvDetailData from '../../../../ContentViews/__tests__/mockDetails.fixtures.json'; +import environmentPathsData from '../../../Publish/__tests__/environmentPaths.fixtures.json'; const cvPromotePath = api.getApiUrl('/content_view_versions/10/promote'); const promoteResponseData = contentViewTaskInProgressResponseData; const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths'); -const environmentPathsData = require('../../../Publish/__tests__/environmentPaths.fixtures.json'); const withCVRoute = component => {component}; diff --git a/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js b/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js index b5b6b16c591..5fd03d8239f 100644 --- a/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js +++ b/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js @@ -1,13 +1,11 @@ import React from 'react'; import { Route } from 'react-router-dom'; import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper'; - import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper'; import api from '../../../../services/api'; import ContentViewDetails from '../ContentViewDetails'; import CONTENT_VIEWS_KEY from '../../ContentViewsConstants'; - -const cvDetailData = require('./contentViewDetails.fixtures.json'); +import cvDetailData from './contentViewDetails.fixtures.json'; const withCVRoute = component => {component}; diff --git a/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js b/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js index c3654cd851b..504b12a6b5c 100644 --- a/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js +++ b/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js @@ -1,18 +1,16 @@ import React from 'react'; import * as reactRedux from 'react-redux'; import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper'; - import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper'; import api from '../../../../services/api'; import PublishContentViewWizard from '../PublishContentViewWizard'; - -const cvDetailData = require('../../Details/__tests__/contentViewDetails.fixtures.json'); +import cvDetailData from '../../Details/__tests__/contentViewDetails.fixtures.json'; +import publishResponseData from './publishResponse.fixture.json'; +import environmentPathsData from './environmentPaths.fixtures.json'; const cvPublishPath = api.getApiUrl('/content_views/1/publish'); -const publishResponseData = require('./publishResponse.fixture.json'); const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths'); -const environmentPathsData = require('./environmentPaths.fixtures.json'); test('Can call API and show Wizard', async (done) => { const scope = nockInstance diff --git a/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js b/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js index f2ed340a082..80048a7531a 100644 --- a/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +++ b/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js @@ -9,8 +9,7 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting, } from '../../../test-utils/nockWrapper'; import createBasicCVs from './basicContentViews.fixtures'; - -const cvIndexData = require('./contentViewList.fixtures.json'); +import cvIndexData from './contentViewList.fixtures.json'; const cvIndexPath = api.getApiUrl('/content_views'); const autocompleteUrl = '/content_views/auto_complete_search';