Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 2 insertions, 31 deletions

diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index 5f8079f0436..efde570512f 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -90,7 +90,7 @@ RSpec.describe 'Group' do
         fill_in 'group_path', with: user.username
         wait_for_requests
 
-        expect(page).to have_content('Group path is already taken')
+        expect(page).to have_content("Group path is already taken. We've suggested one that is available.")
       end
 
       it 'does not break after an invalid form submit' do
@@ -257,7 +257,7 @@ RSpec.describe 'Group' do
         fill_in 'Group URL', with: subgroup.path
         wait_for_requests
 
-        expect(page).to have_content('Group path is already taken')
+        expect(page).to have_content("Group path is already taken. We've suggested one that is available.")
       end
     end
   end
@@ -447,35 +447,6 @@ RSpec.describe 'Group' do
     end
   end
 
-  describe 'new_repo experiment' do
-    let_it_be(:group) { create_default(:group) }
-
-    it 'when in candidate renders "project/repository"' do
-      stub_experiments(new_repo: :candidate)
-
-      visit group_path(group)
-
-      find('li.header-new.dropdown').click
-
-      page.within('li.header-new.dropdown') do
-        expect(page).to have_selector('a', text: 'New project/repository')
-      end
-    end
-
-    it 'when in control renders "project/repository"' do
-      stub_experiments(new_repo: :control)
-
-      visit group_path(group)
-
-      find('li.header-new.dropdown').click
-
-      page.within('li.header-new.dropdown') do
-        expect(page).to have_selector('a', text: 'New project')
-        expect(page).to have_no_selector('a', text: 'New project/repository')
-      end
-    end
-  end
-
   def remove_with_confirm(button_text, confirm_with)
     click_button button_text
     fill_in 'confirm_name_input', with: confirm_with