Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 18 insertions, 10 deletions

diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
index 7143cc574b8..5b89bcc7375 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Configure', :orchestrated, :mattermost do
+  RSpec.describe 'Configure', :orchestrated, :mattermost do
     describe 'Mattermost support' do
       it 'user creates a group with a mattermost team' do
         Flow::Login.sign_in
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
index 9eab03323a8..f307d286587 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
@@ -1,24 +1,32 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Manage' do
+  RSpec.describe 'Manage' do
     describe 'Project transfer between groups' do
-      it 'user transfers a project between groups' do
-        Flow::Login.sign_in
-
-        source_group = Resource::Group.fabricate_via_api! do |group|
+      let(:source_group) do
+        Resource::Group.fabricate_via_api! do |group|
           group.path = 'source-group'
         end
+      end
 
-        target_group = Resource::Group.fabricate_via_api! do |group|
+      let(:target_group) do
+        Resource::Group.fabricate_via_api! do |group|
           group.path = 'target-group'
         end
+      end
 
-        project = Resource::Project.fabricate_via_api! do |project|
+      let(:project) do
+        Resource::Project.fabricate_via_api! do |project|
           project.group = source_group
           project.name =  'transfer-project'
           project.initialize_with_readme = true
         end
+      end
+
+      let(:edited_readme_content) { 'Here is the edited content.' }
+
+      before do
+        Flow::Login.sign_in
 
         project.visit!
 
@@ -28,14 +36,14 @@ module QA
 
         Page::File::Show.perform(&:click_edit)
 
-        edited_readme_content = 'Here is the edited content.'
-
         Page::File::Edit.perform do |file|
           file.remove_content
           file.add_content(edited_readme_content)
           file.commit_changes
         end
+      end
 
+      it 'user transfers a project between groups' do
         Page::File::Show.perform(&:go_to_general_settings)
 
         Page::Project::Settings::Main.perform(&:expand_advanced_settings)