Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 9 insertions, 5 deletions

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 777c0898de0..65119e288a1 100644
--- a/spec/frontend/packages_and_registries/settings/group/mock_data.js
+++ b/spec/frontend/packages_and_registries/settings/group/mock_data.js
@@ -4,6 +4,8 @@ export const groupPackageSettingsMock = {
       packageSettings: {
         mavenDuplicatesAllowed: true,
         mavenDuplicateExceptionRegex: '',
+        genericDuplicatesAllowed: true,
+        genericDuplicateExceptionRegex: '',
       },
     },
   },
@@ -14,7 +16,9 @@ export const groupPackageSettingsMutationMock = (override) => ({
     updateNamespacePackageSettings: {
       packageSettings: {
         mavenDuplicatesAllowed: true,
-        mavenDuplicateExceptionRegex: 'latest[master]something',
+        mavenDuplicateExceptionRegex: 'latest[main]something',
+        genericDuplicatesAllowed: true,
+        genericDuplicateExceptionRegex: 'latest[main]somethingGeneric',
       },
       errors: [],
       ...override,
@@ -26,20 +30,20 @@ export const groupPackageSettingsMutationErrorMock = {
   errors: [
     {
       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 }],
       extensions: {
         value: {
           namespacePath: 'gitlab-org',
-          mavenDuplicateExceptionRegex: 'latest[master]something))',
+          mavenDuplicateExceptionRegex: 'latest[main]something))',
         },
         problems: [
           {
             path: ['mavenDuplicateExceptionRegex'],
             explanation:
-              'latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]something))',
+              'latest[main]somethingj)) is an invalid regexp: unexpected ): latest[main]something))',
             message:
-              'latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]something))',
+              'latest[main]somethingj)) is an invalid regexp: unexpected ): latest[main]something))',
           },
         ],
       },