Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 1 deletions

diff --git a/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js b/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js
index 654a8fd00d3..6255d6aba1f 100644
--- a/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js
+++ b/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js
@@ -70,6 +70,7 @@ describe('import table row', () => {
       propsData: {
         availableNamespaces: availableNamespacesFixture,
         groupPathRegex: /.*/,
+        groupUrlErrorMessage: 'Please choose a group URL with no special characters or spaces.',
         ...props,
       },
     });
@@ -198,7 +199,9 @@ describe('import table row', () => {
         groupPathRegex: /^[a-zA-Z]+$/,
       });
 
-      expect(wrapper.text()).toContain('Please choose a group URL with no special characters.');
+      expect(wrapper.text()).toContain(
+        'Please choose a group URL with no special characters or spaces.',
+      );
     });
 
     it('reports invalid group name if relevant validation error exists', async () => {
diff --git a/spec/frontend/import_entities/import_groups/components/import_table_spec.js b/spec/frontend/import_entities/import_groups/components/import_table_spec.js
index 99ef6d9a7fb..1c3e4d0b1e1 100644
--- a/spec/frontend/import_entities/import_groups/components/import_table_spec.js
+++ b/spec/frontend/import_entities/import_groups/components/import_table_spec.js
@@ -62,6 +62,7 @@ describe('import table', () => {
       propsData: {
         groupPathRegex: /.*/,
         sourceUrl: SOURCE_URL,
+        groupUrlErrorMessage: 'Please choose a group URL with no special characters or spaces.',
       },
       stubs: {
         GlSprintf,