Add latest changes from gitlab-org/gitlab@master

4 files changed, 14 insertions, 8 deletions

diff --git a/qa/qa/page/admin/overview/users/index.rb b/qa/qa/page/admin/overview/users/index.rb
index 1885644d226..f8c79b4f72c 100644
--- a/qa/qa/page/admin/overview/users/index.rb
+++ b/qa/qa/page/admin/overview/users/index.rb
@@ -29,7 +29,7 @@ module QA
 
             def click_user(username)
               within_element(:user_row_content, text: username) do
-                click_element(:username_link)
+                click_link(username)
               end
             end
           end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
index f09ffb1c9fb..39e77346a0e 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe "Manage", :requires_admin do
-    describe "Group bulk import" do
+  RSpec.describe 'Manage', :requires_admin do
+    describe 'Group bulk import' do
       let!(:api_client) { Runtime::API::Client.as_admin }
       let!(:user) do
         Resource::User.fabricate_via_api! do |usr|
@@ -52,8 +52,13 @@ module QA
         )
       end
 
+      def staging?
+        Runtime::Scenario.gitlab_address.include?('staging.gitlab.com')
+      end
+
       before(:all) do
         Runtime::Feature.enable(:bulk_import)
+        Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
       end
 
       before do
@@ -66,10 +71,10 @@ module QA
       end
 
       it(
-        "performs bulk group import from another gitlab instance",
-        testcase: "https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785",
+        'performs bulk group import from another gitlab instance',
+        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785',
         # https://gitlab.com/gitlab-org/gitlab/-/issues/330344
-        exclude: { job: ["ce:relative_url", "ee:relative_url"] }
+        exclude: { job: ['ce:relative_url', 'ee:relative_url'] }
       ) do
         Page::Group::BulkImport.perform do |import_page|
           import_page.import_group(source_group.path, sandbox.path)
@@ -88,6 +93,7 @@ module QA
 
       after(:all) do
         Runtime::Feature.disable(:bulk_import)
+        Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index 5fbcd69817b..23a21d70cc1 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -138,7 +138,7 @@ module QA
         Page::Admin::Overview::Users::Index.perform do |index|
           index.click_pending_approval_tab
           index.search_user(user.username)
-          index.click_user(user.username)
+          index.click_user(user.name)
         end
 
         Page::Admin::Overview::Users::Show.perform do |show|
diff --git a/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb
index 2a91c674a22..d9b5ffcdc47 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb
@@ -49,7 +49,7 @@ module QA
 
           Page::File::Show.perform(&:click_edit)
 
-          expect(page).to have_text("You're not allowed to edit files in this project directly.")
+          expect(page).to have_text("You can’t edit files directly in this project.")
         end
 
         after do