diff --git a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js index 3689199751d21a4b6bceb018c69c9eef6ffeb46b..a009be4de131a5854e1b7abeb3a867cf8046d7b0 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js +++ b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js @@ -2,7 +2,7 @@ import { GlToast } from '@gitlab/ui'; import Vue from 'vue'; import Translate from '~/vue_shared/translate'; -import SettingsApp from './components/group_settings_app.vue'; +import SettingsApp from 'ee_else_ce/packages_and_registries/settings/group/components/group_settings_app.vue'; import { apolloProvider } from './graphql'; Vue.use(Translate); diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue index 6b03ca9b8625590ef62f1d3aee50a5825891e8ef..23c99b8231f469d2462154260b4f1a684a4d4d62 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue +++ b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue @@ -1,13 +1,10 @@ + + diff --git a/ee/app/assets/javascripts/packages_and_registries/settings/group/components/virtual_registries_setting.vue b/ee/app/assets/javascripts/packages_and_registries/settings/group/components/virtual_registries_setting.vue index a4101add83ab1adc6e89a10c7653cc2e595fdd08..f3a1e68c1d26547e86988bdc98f1d8b8ffe13365 100644 --- a/ee/app/assets/javascripts/packages_and_registries/settings/group/components/virtual_registries_setting.vue +++ b/ee/app/assets/javascripts/packages_and_registries/settings/group/components/virtual_registries_setting.vue @@ -3,7 +3,7 @@ import { GlToggle, GlSprintf, GlLink, GlExperimentBadge } from '@gitlab/ui'; import SettingsSection from '~/vue_shared/components/settings/settings_section.vue'; import updateVirtualRegistriesSetting from 'ee_component/packages_and_registries/settings/group/graphql/mutations/update_virtual_registries_setting.mutation.graphql'; import { updateVirtualRegistriesSettingOptimisticResponse } from 'ee_component/packages_and_registries/settings/group/graphql/utils/optimistic_responses'; -import { updateGroupPackageSettings } from 'ee_component/packages_and_registries/settings/group/graphql/utils/cache_update'; +import { updateGroupVirtualRegistriesSetting } from 'ee_component/packages_and_registries/settings/group/graphql/utils/cache_update'; export default { name: 'VirtualRegistriesSetting', @@ -61,7 +61,7 @@ export default { const apolloConfig = { mutation: updateVirtualRegistriesSetting, variables: this.mutationVariables(payload), - update: updateGroupPackageSettings(this.groupPath), + update: updateGroupVirtualRegistriesSetting(this.groupPath), optimisticResponse: updateVirtualRegistriesSettingOptimisticResponse({ ...this.virtualRegistriesSetting, ...payload, @@ -76,7 +76,7 @@ export default { diff --git a/ee/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js b/ee/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js index d1ffee043317123e425e5ab88cd60ce58465cae6..4415d634ebd5ad26aeceae2ef8abb7d9db07a5c3 100644 --- a/ee/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js +++ b/ee/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js @@ -1,7 +1,7 @@ import { produce } from 'immer'; import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; -export const updateGroupPackageSettings = +export const updateGroupVirtualRegistriesSetting = (fullPath) => (client, { data: updatedData }) => { const queryAndParams = { diff --git a/ee/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js b/ee/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js index a65791ac3388ddf254eade20a846e89642bbb82c..e872172be467ef7291ccc9b09ee240a4e15e1aaf 100644 --- a/ee/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js +++ b/ee/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js @@ -1,25 +1,17 @@ import { GlAlert } from '@gitlab/ui'; -import { shallowMount } from '@vue/test-utils'; +import { mount, shallowMount } from '@vue/test-utils'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import PackagesSettings from '~/packages_and_registries/settings/group/components/packages_settings.vue'; -import DependencyProxySettings from '~/packages_and_registries/settings/group/components/dependency_proxy_settings.vue'; -import PackagesForwardingSettings from '~/packages_and_registries/settings/group/components/packages_forwarding_settings.vue'; import VirtualRegistriesSetting from 'ee_component/packages_and_registries/settings/group/components/virtual_registries_setting.vue'; - -import GroupSettingsApp from '~/packages_and_registries/settings/group/components/group_settings_app.vue'; +import GroupSettingsApp from 'ee_component/packages_and_registries/settings/group/components/group_settings_app.vue'; +import CeGroupSettingsApp from '~/packages_and_registries/settings/group/components/group_settings_app.vue'; import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; -import { - groupPackageSettingsMock, - packageSettings, - dependencyProxySettings, - dependencyProxyImageTtlPolicy, - virtualRegistriesSetting, -} from '../mock_data'; + +import { groupVirtualRegistriesSettingMock } from '../mock_data'; jest.mock('~/alert'); @@ -30,17 +22,18 @@ describe('EE Group Settings App', () => { const defaultProvide = { groupPath: 'foo_group_path', + groupDependencyProxyPath: 'group_dependency_proxy_path', glAbilities: {}, }; const mountComponent = ({ - resolver = jest.fn().mockResolvedValue(groupPackageSettingsMock), + resolver = jest.fn().mockResolvedValue(groupVirtualRegistriesSettingMock), provide = defaultProvide, - adminDependencyProxyAbility = true, adminVirtualRegistryAbility = true, mavenVirtualRegistryFeature = true, packagesVirtualRegistryLicense = true, uiForVirtualRegistriesFeature = true, + mountFn = mount, } = {}) => { Vue.use(VueApollo); @@ -48,13 +41,13 @@ describe('EE Group Settings App', () => { apolloProvider = createMockApollo(requestHandlers); - wrapper = shallowMount(GroupSettingsApp, { + wrapper = mountFn(GroupSettingsApp, { apolloProvider, provide: { ...provide, glAbilities: { - adminDependencyProxy: adminDependencyProxyAbility, adminVirtualRegistry: adminVirtualRegistryAbility, + adminDependencyProxy: true, }, glFeatures: { mavenVirtualRegistry: mavenVirtualRegistryFeature, @@ -76,10 +69,8 @@ describe('EE Group Settings App', () => { show = jest.fn(); }); - const findAlert = () => wrapper.findComponent(GlAlert); - const findPackageSettings = () => wrapper.findComponent(PackagesSettings); - const findPackageForwardingSettings = () => wrapper.findComponent(PackagesForwardingSettings); - const findDependencyProxySettings = () => wrapper.findComponent(DependencyProxySettings); + const findCeComponent = () => wrapper.findComponent(CeGroupSettingsApp); + const findAlert = () => findCeComponent().findComponent(GlAlert); const findVirtualRegistriesSetting = () => wrapper.findComponent(VirtualRegistriesSetting); const waitForApolloQueryAndRender = async () => { @@ -87,60 +78,42 @@ describe('EE Group Settings App', () => { await nextTick(); }; - const packageSettingsProps = { packageSettings }; - const packageForwardingSettingsProps = { forwardSettings: { ...packageSettings } }; - const dependencyProxyProps = { - dependencyProxySettings: dependencyProxySettings(), - dependencyProxyImageTtlPolicy: dependencyProxyImageTtlPolicy(), - }; - const virtualRegistriesProps = { virtualRegistriesSetting: virtualRegistriesSetting() }; - - describe.each` - finder | entitySpecificProps | id - ${findPackageSettings} | ${packageSettingsProps} | ${'packages-settings'} - ${findPackageForwardingSettings} | ${packageForwardingSettingsProps} | ${'packages-forwarding-settings'} - ${findDependencyProxySettings} | ${dependencyProxyProps} | ${'dependency-proxy-settings'} - ${findVirtualRegistriesSetting} | ${virtualRegistriesProps} | ${'virtual-registries-setting'} - `('settings blocks', ({ finder, entitySpecificProps, id }) => { + describe('virtual registries setting', () => { beforeEach(() => { mountComponent(); return waitForApolloQueryAndRender(); }); - it('renders the settings block', () => { - expect(finder().exists()).toBe(true); + it('renders the setting', () => { + expect(findVirtualRegistriesSetting().exists()).toBe(true); }); it('has the correct id', () => { - expect(finder().attributes('id')).toBe(id); - }); - - it('binds the correctProps', () => { - expect(finder().props()).toMatchObject(entitySpecificProps); + expect(findVirtualRegistriesSetting().attributes('id')).toBe('virtual-registries-setting'); }); describe('success event', () => { - it('shows a success toast', () => { - finder().vm.$emit('success'); + it('shows a success toast', async () => { + findVirtualRegistriesSetting().vm.$emit('success'); + await nextTick(); + expect(show).toHaveBeenCalledWith('Settings saved successfully.'); }); it('hides the error alert', async () => { - finder().vm.$emit('error'); + findVirtualRegistriesSetting().vm.$emit('error'); await nextTick(); - expect(findAlert().exists()).toBe(true); - finder().vm.$emit('success'); + findVirtualRegistriesSetting().vm.$emit('success'); await nextTick(); - expect(findAlert().exists()).toBe(false); }); }); describe('error event', () => { beforeEach(() => { - finder().vm.$emit('error'); + findVirtualRegistriesSetting().vm.$emit('error'); return nextTick(); }); @@ -152,7 +125,6 @@ describe('EE Group Settings App', () => { expect(findAlert().exists()).toBe(true); findAlert().vm.$emit('dismiss'); - await nextTick(); expect(findAlert().exists()).toBe(false); @@ -160,75 +132,19 @@ describe('EE Group Settings App', () => { }); }); - describe('when ability adminVirtualRegistriesSetting is false', () => { - beforeEach(() => { - mountComponent({ - adminVirtualRegistryAbility: false, - }); - }); - - it('does not render the virtual registries setting section', () => { - expect(findVirtualRegistriesSetting().exists()).toBe(false); - }); - - it('renders other settings section', () => { - expect(findPackageSettings().exists()).toBe(true); - expect(findPackageForwardingSettings().exists()).toBe(true); - expect(findDependencyProxySettings().exists()).toBe(true); - }); - }); - - describe('when maven virtual registry feature flag is false', () => { - beforeEach(() => { - mountComponent({ - mavenVirtualRegistryFeature: false, - }); - }); - - it('does not render the virtual registries setting section', () => { - expect(findVirtualRegistriesSetting().exists()).toBe(false); - }); - - it('renders other settings section', () => { - expect(findPackageSettings().exists()).toBe(true); - expect(findPackageForwardingSettings().exists()).toBe(true); - expect(findDependencyProxySettings().exists()).toBe(true); - }); - }); - - describe('when packages virtual registry license is false', () => { - beforeEach(() => { - mountComponent({ - packagesVirtualRegistryLicense: false, - }); - }); - - it('does not render the virtual registries setting section', () => { - expect(findVirtualRegistriesSetting().exists()).toBe(false); - }); - - it('renders other settings section', () => { - expect(findPackageSettings().exists()).toBe(true); - expect(findPackageForwardingSettings().exists()).toBe(true); - expect(findDependencyProxySettings().exists()).toBe(true); - }); - }); - - describe('when ui for virtual registries feature flag is false', () => { + describe.each` + description | options + ${'ability adminVirtualRegistriesSetting'} | ${{ adminVirtualRegistryAbility: false }} + ${'maven virtual registry feature flag'} | ${{ mavenVirtualRegistryFeature: false }} + ${'packages virtual registry license'} | ${{ packagesVirtualRegistryLicense: false }} + ${'ui for virtual registries feature flag'} | ${{ uiForVirtualRegistriesFeature: false }} + `('when $description is false', ({ options }) => { beforeEach(() => { - mountComponent({ - uiForVirtualRegistriesFeature: false, - }); + mountComponent({ ...options, mountFn: shallowMount }); }); it('does not render the virtual registries setting section', () => { expect(findVirtualRegistriesSetting().exists()).toBe(false); }); - - it('renders other settings section', () => { - expect(findPackageSettings().exists()).toBe(true); - expect(findPackageForwardingSettings().exists()).toBe(true); - expect(findDependencyProxySettings().exists()).toBe(true); - }); }); }); diff --git a/ee/spec/frontend/packages_and_registries/settings/group/components/virtual_registries_setting_spec.js b/ee/spec/frontend/packages_and_registries/settings/group/components/virtual_registries_setting_spec.js index b141eca62cb010dcbc9b6767b41137b50c72242d..4515c6edd6aad06124d73b2ae375098acf6cd7c5 100644 --- a/ee/spec/frontend/packages_and_registries/settings/group/components/virtual_registries_setting_spec.js +++ b/ee/spec/frontend/packages_and_registries/settings/group/components/virtual_registries_setting_spec.js @@ -12,7 +12,7 @@ import SettingsSection from '~/vue_shared/components/settings/settings_section.v import { updateVirtualRegistriesSettingOptimisticResponse } from 'ee_component/packages_and_registries/settings/group/graphql/utils/optimistic_responses'; import { - groupPackageSettingsMock, + groupVirtualRegistriesSettingMock, mutationErrorMock, virtualRegistriesSetting as virtualRegistriesSettingMock, virtualRegistriesSettingMutationMock, @@ -71,7 +71,7 @@ describe('VirtualRegistriesSetting', () => { variables: { fullPath: defaultProvide.groupPath, }, - ...groupPackageSettingsMock, + ...groupVirtualRegistriesSettingMock, }); }; @@ -84,7 +84,7 @@ describe('VirtualRegistriesSetting', () => { it('has the correct header text and description', () => { mountComponent(); - expect(findSettingsSection().props('heading')).toContain('Virtual Registry'); + expect(findSettingsSection().props('heading')).toContain('Virtual registry'); expect(findSettingsSection().props('description')).toContain( 'Manage packages across multiple sources and streamline development workflows using virtual registries.', ); diff --git a/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/cache_update_spec.js b/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/cache_update_spec.js index 4463cb455283dacb49d6ed51a5f204219c0323f0..9ec1a907c1af51e4a553778770188291f869b2ae 100644 --- a/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/cache_update_spec.js +++ b/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/cache_update_spec.js @@ -1,7 +1,7 @@ -import { updateGroupPackageSettings } from 'ee_component/packages_and_registries/settings/group/graphql/utils/cache_update'; +import { updateGroupVirtualRegistriesSetting } from 'ee_component/packages_and_registries/settings/group/graphql/utils/cache_update'; import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; -describe('updateGroupPackageSettings', () => { +describe('updateGroupVirtualRegistriesSetting', () => { let client; const cacheMock = { @@ -36,12 +36,12 @@ describe('updateGroupPackageSettings', () => { describe('when updating the cache', () => { it('reads the cache with the correct query', () => { - updateGroupPackageSettings('foo')(client, payload); + updateGroupVirtualRegistriesSetting('foo')(client, payload); expect(client.readQuery).toHaveBeenCalledWith(queryAndVariables); }); it('writes the correct result to the cache', () => { - updateGroupPackageSettings('foo')(client, payload); + updateGroupVirtualRegistriesSetting('foo')(client, payload); expect(client.writeQuery).toHaveBeenCalledWith({ ...queryAndVariables, data: { @@ -62,7 +62,7 @@ describe('updateGroupPackageSettings', () => { }); it('does not write to the store', () => { - updateGroupPackageSettings('foo')(client, payload); + updateGroupVirtualRegistriesSetting('foo')(client, payload); expect(client.writeQuery).not.toHaveBeenCalled(); }); }); @@ -74,7 +74,7 @@ describe('updateGroupPackageSettings', () => { }); it('does not write to the store', () => { - updateGroupPackageSettings('foo')(client, payload); + updateGroupVirtualRegistriesSetting('foo')(client, payload); expect(client.writeQuery).not.toHaveBeenCalled(); }); }); diff --git a/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/optimistic_responses_spec.js b/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/optimistic_responses_spec.js index a1f179399cdcd66c1e9ec746b016cd825589a95a..76533369f1a056517f25779a57b4ae8d1db3b4ff 100644 --- a/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/optimistic_responses_spec.js +++ b/ee/spec/frontend/packages_and_registries/settings/group/graphql/utils/optimistic_responses_spec.js @@ -2,7 +2,8 @@ import { updateVirtualRegistriesSettingOptimisticResponse } from 'ee_component/p describe('updateVirtualRegistriesSettingOptimisticResponse', () => { it('returns the correct structure', () => { - expect(updateVirtualRegistriesSettingOptimisticResponse({ foo: 'bar' })).toMatchInlineSnapshot(` + expect(updateVirtualRegistriesSettingOptimisticResponse({ enabled: true })) + .toMatchInlineSnapshot(` { "__typename": "Mutation", "updateVirtualRegistriesSetting": { @@ -10,7 +11,7 @@ describe('updateVirtualRegistriesSettingOptimisticResponse', () => { "errors": [], "virtualRegistriesSetting": { "__typename": "VirtualRegistriesSetting", - "foo": "bar", + "enabled": true, }, }, } diff --git a/ee/spec/frontend/packages_and_registries/settings/group/mock_data.js b/ee/spec/frontend/packages_and_registries/settings/group/mock_data.js index 72129a8b7f7d6519e7123aeebf473f4c268d5ca1..0086cd3e2ca8cdeafe5ced3bdf5902f460f49e5c 100644 --- a/ee/spec/frontend/packages_and_registries/settings/group/mock_data.js +++ b/ee/spec/frontend/packages_and_registries/settings/group/mock_data.js @@ -1,52 +1,20 @@ import { - packageForwardingSettings, - packageSettings, - dependencyProxySettings, - dependencyProxyImageTtlPolicy, - groupPackageSettingsMutationMock, - groupPackageForwardSettingsMutationMock, - dependencyProxySettingMutationMock, - dependencyProxyUpdateTllPolicyMutationMock, - groupPackageSettingsMutationErrorMock, mutationErrorMock, - npmProps, - pypiProps, - mavenProps, + groupPackageSettingsMock, } from 'jest/packages_and_registries/settings/group/mock_data'; -export { - packageForwardingSettings, - packageSettings, - dependencyProxySettings, - dependencyProxyImageTtlPolicy, - groupPackageSettingsMutationMock, - groupPackageForwardSettingsMutationMock, - dependencyProxySettingMutationMock, - dependencyProxyUpdateTllPolicyMutationMock, - groupPackageSettingsMutationErrorMock, - mutationErrorMock, - npmProps, - pypiProps, - mavenProps, -}; +export { mutationErrorMock, groupPackageSettingsMock }; export const virtualRegistriesSetting = (extend) => ({ enabled: true, ...extend, }); -export const groupPackageSettingsMock = { +export const groupVirtualRegistriesSettingMock = { data: { group: { - id: '1', - fullPath: 'foo_group_path', - dependencyProxySetting: dependencyProxySettings(), - dependencyProxyImageTtlPolicy: dependencyProxyImageTtlPolicy(), + ...groupPackageSettingsMock.data.group, virtualRegistriesSetting: virtualRegistriesSetting(), - packageSettings: { - ...packageSettings, - __typename: 'PackageSettings', - }, __typename: 'Group', }, }, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bda25e7094aceeab8293bfa9d38c5ad5bc025f60..54ef0329d216145cb68edac624f9c3820c830165 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -72463,7 +72463,7 @@ msgstr "" msgid "VirtualRegistry|Edit upstream %{name}" msgstr "" -msgid "VirtualRegistry|Enable Virtual Registry" +msgid "VirtualRegistry|Enable virtual registry" msgstr "" msgid "VirtualRegistry|Enter a personal access token for GitLab-hosted upstreams." diff --git a/spec/frontend/packages_and_registries/settings/group/components/dependency_proxy_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/dependency_proxy_settings_spec.js index 04ec6bc25e36e928ce884743afecf98645f6ab56..541a3da81c0a66841f2535e0f9e2d4303cf7de52 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/dependency_proxy_settings_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/dependency_proxy_settings_spec.js @@ -28,7 +28,7 @@ import { groupPackageSettingsMock, mutationErrorMock, dependencyProxyUpdateTllPolicyMutationMock, -} from 'ee_else_ce_jest/packages_and_registries/settings/group/mock_data'; +} from '../mock_data'; jest.mock('~/alert'); jest.mock('~/packages_and_registries/settings/group/graphql/utils/optimistic_responses'); diff --git a/spec/frontend/packages_and_registries/settings/group/components/docker_hub_authentication_section_spec.js b/spec/frontend/packages_and_registries/settings/group/components/docker_hub_authentication_section_spec.js index 92486074e1a22fab5d7badaa7cc4f8285d8ee9a5..d192447e0374ed6903f0390afed71ecb02b5636a 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/docker_hub_authentication_section_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/docker_hub_authentication_section_spec.js @@ -13,7 +13,7 @@ import updateDockerHubCredentialsMutation from '~/packages_and_registries/settin import { dependencyProxySettings as dependencyProxySettingsMock, dependencyProxySettingMutationMock, -} from 'ee_else_ce_jest/packages_and_registries/settings/group/mock_data'; +} from '../mock_data'; describe('DockerHubAuthenticationSection', () => { let wrapper; diff --git a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js index 64694ba05e9a5be3fdd83535222b31096ce3dd16..55926883a5a5f26b76be7346f2296d14177f5087 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js @@ -17,7 +17,7 @@ import { packageSettings, dependencyProxySettings, dependencyProxyImageTtlPolicy, -} from 'ee_else_ce_jest/packages_and_registries/settings/group/mock_data'; +} from '../mock_data'; jest.mock('~/alert'); diff --git a/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js index 17164fe79e7de40c89d6bae8410cd61fca503054..bba0408a66e34f96580e35f1bc06740cafa0b1ab 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js @@ -21,7 +21,7 @@ import { groupPackageSettingsMock, groupPackageSettingsMutationMock, groupPackageSettingsMutationErrorMock, -} from 'ee_else_ce_jest/packages_and_registries/settings/group/mock_data'; +} from '../mock_data'; jest.mock('~/alert'); jest.mock('~/packages_and_registries/settings/group/graphql/utils/optimistic_responses'); diff --git a/spec/frontend/packages_and_registries/settings/group/components/packages_forwarding_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/packages_forwarding_settings_spec.js index 0f4d7c8ea9426d47f4b4ead0c97e7a9165aef63f..a6c407e60c2a6e36589d4efbd4fab9109fc7e993 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/packages_forwarding_settings_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/packages_forwarding_settings_spec.js @@ -23,7 +23,7 @@ import { npmProps, pypiProps, mavenProps, -} from 'ee_else_ce_jest/packages_and_registries/settings/group/mock_data'; +} from '../mock_data'; jest.mock('~/alert'); jest.mock('~/packages_and_registries/settings/group/graphql/utils/optimistic_responses'); diff --git a/spec/frontend/packages_and_registries/settings/group/mock_data.js b/spec/frontend/packages_and_registries/settings/group/mock_data.js index b5a0215781d2fc9ef13ba833c92faac7f661598f..99f178e3b59d85f4829d4c94ffb4dbd7e6c01b58 100644 --- a/spec/frontend/packages_and_registries/settings/group/mock_data.js +++ b/spec/frontend/packages_and_registries/settings/group/mock_data.js @@ -52,6 +52,7 @@ export const groupPackageSettingsMock = { ...packageSettings, __typename: 'PackageSettings', }, + virtualRegistriesSetting: null, }, }, };