Commit cd0286d9 authored by Phil Hughes's avatar Phil Hughes

Merge branch '327686-update-settings-specs' into 'master'

Update default branch name in settings specs

See merge request gitlab-org/gitlab!59989
parents e77edc54 3e717cd2
...@@ -200,7 +200,7 @@ describe('Group Settings App', () => { ...@@ -200,7 +200,7 @@ describe('Group Settings App', () => {
}); });
it('has an optimistic response', async () => { it('has an optimistic response', async () => {
const mavenDuplicateExceptionRegex = 'latest[master]something'; const mavenDuplicateExceptionRegex = 'latest[main]something';
mountComponent(); mountComponent();
await waitForApolloQueryAndRender(); await waitForApolloQueryAndRender();
......
...@@ -9,7 +9,7 @@ describe('Package and Registries settings group cache updates', () => { ...@@ -9,7 +9,7 @@ describe('Package and Registries settings group cache updates', () => {
updateNamespacePackageSettings: { updateNamespacePackageSettings: {
packageSettings: { packageSettings: {
mavenDuplicatesAllowed: false, mavenDuplicatesAllowed: false,
mavenDuplicateExceptionRegex: 'latest[master]something', mavenDuplicateExceptionRegex: 'latest[main]something',
}, },
}, },
}, },
......
...@@ -14,7 +14,7 @@ export const groupPackageSettingsMutationMock = (override) => ({ ...@@ -14,7 +14,7 @@ export const groupPackageSettingsMutationMock = (override) => ({
updateNamespacePackageSettings: { updateNamespacePackageSettings: {
packageSettings: { packageSettings: {
mavenDuplicatesAllowed: true, mavenDuplicatesAllowed: true,
mavenDuplicateExceptionRegex: 'latest[master]something', mavenDuplicateExceptionRegex: 'latest[main]something',
}, },
errors: [], errors: [],
...override, ...override,
...@@ -26,20 +26,20 @@ export const groupPackageSettingsMutationErrorMock = { ...@@ -26,20 +26,20 @@ export const groupPackageSettingsMutationErrorMock = {
errors: [ errors: [
{ {
message: message:
'Variable $input of type UpdateNamespacePackageSettingsInput! was provided invalid value for mavenDuplicateExceptionRegex (latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]somethingj)))', 'Variable $input of type UpdateNamespacePackageSettingsInput! was provided invalid value for mavenDuplicateExceptionRegex (latest[main]somethingj)) is an invalid regexp: unexpected ): latest[main]somethingj)))',
locations: [{ line: 1, column: 41 }], locations: [{ line: 1, column: 41 }],
extensions: { extensions: {
value: { value: {
namespacePath: 'gitlab-org', namespacePath: 'gitlab-org',
mavenDuplicateExceptionRegex: 'latest[master]something))', mavenDuplicateExceptionRegex: 'latest[main]something))',
}, },
problems: [ problems: [
{ {
path: ['mavenDuplicateExceptionRegex'], path: ['mavenDuplicateExceptionRegex'],
explanation: explanation:
'latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]something))', 'latest[main]somethingj)) is an invalid regexp: unexpected ): latest[main]something))',
message: message:
'latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]something))', 'latest[main]somethingj)) is an invalid regexp: unexpected ): latest[main]something))',
}, },
], ],
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment