Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

10 files changed, 29 insertions, 12 deletions

diff --git a/qa/qa/flow/login.rb b/qa/qa/flow/login.rb
index 05f114acbc5..ec205e0aa86 100644
--- a/qa/qa/flow/login.rb
+++ b/qa/qa/flow/login.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module Login
-      module_function
+      extend self
 
       def while_signed_in(as: nil, address: :gitlab, admin: false)
         sign_in(as: as, address: address, admin: admin)
@@ -52,3 +52,5 @@ module QA
     end
   end
 end
+
+QA::Flow::Login.prepend_mod_with('Flow::Login', namespace: QA)
diff --git a/qa/qa/flow/merge_request.rb b/qa/qa/flow/merge_request.rb
index f1cab2c7d1a..24abfa9e356 100644
--- a/qa/qa/flow/merge_request.rb
+++ b/qa/qa/flow/merge_request.rb
@@ -3,11 +3,10 @@
 module QA
   module Flow
     module MergeRequest
-      module_function
+      extend self
 
       def enable_merge_trains
-        Page::Project::Menu.perform(&:go_to_general_settings)
-        Page::Project::Settings::Main.perform(&:expand_merge_requests_settings)
+        Page::Project::Menu.perform(&:go_to_merge_request_settings)
         Page::Project::Settings::MergeRequest.perform(&:enable_merge_train)
       end
 
@@ -33,3 +32,5 @@ module QA
     end
   end
 end
+
+QA::Flow::MergeRequest.prepend_mod_with('Flow::MergeRequest', namespace: QA)
diff --git a/qa/qa/flow/pipeline.rb b/qa/qa/flow/pipeline.rb
index d19b2530bb8..fb6a5425a6e 100644
--- a/qa/qa/flow/pipeline.rb
+++ b/qa/qa/flow/pipeline.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module Pipeline
-      module_function
+      extend self
 
       # Acceptable statuses:
       # canceled, created, failed, manual, passed
@@ -27,3 +27,5 @@ module QA
     end
   end
 end
+
+QA::Flow::Pipeline.prepend_mod_with('Flow::Pipeline', namespace: QA)
diff --git a/qa/qa/flow/project.rb b/qa/qa/flow/project.rb
index 397806b33a3..70bdcfcb719 100644
--- a/qa/qa/flow/project.rb
+++ b/qa/qa/flow/project.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module Project
-      module_function
+      extend self
 
       def go_to_create_project_from_template
         Page::Project::New.perform(&:click_create_from_template_link)
@@ -11,3 +11,5 @@ module QA
     end
   end
 end
+
+QA::Flow::Project.prepend_mod_with('Flow::Project', namespace: QA)
diff --git a/qa/qa/flow/purchase.rb b/qa/qa/flow/purchase.rb
index e0efa8a8178..c07e03c104d 100644
--- a/qa/qa/flow/purchase.rb
+++ b/qa/qa/flow/purchase.rb
@@ -5,7 +5,7 @@ module QA
     module Purchase
       include QA::Support::Helpers::Plan
 
-      module_function
+      extend self
 
       def upgrade_subscription(plan: PREMIUM)
         Page::Group::Menu.perform(&:go_to_billing)
diff --git a/qa/qa/flow/saml.rb b/qa/qa/flow/saml.rb
index 1280f59c3c2..8a0ebb9f551 100644
--- a/qa/qa/flow/saml.rb
+++ b/qa/qa/flow/saml.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module Saml
-      module_function
+      extend self
 
       def page
         Capybara.current_session
@@ -72,3 +72,5 @@ module QA
     end
   end
 end
+
+QA::Flow::Saml.prepend_mod_with('Flow::Saml', namespace: QA)
diff --git a/qa/qa/flow/settings.rb b/qa/qa/flow/settings.rb
index 775b7686c10..8e6ce667475 100644
--- a/qa/qa/flow/settings.rb
+++ b/qa/qa/flow/settings.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module Settings
-      module_function
+      extend self
 
       def disable_snowplow
         Flow::Login.while_signed_in_as_admin do
@@ -23,3 +23,5 @@ module QA
     end
   end
 end
+
+QA::Flow::Settings.prepend_mod_with('Flow::Settings', namespace: QA)
diff --git a/qa/qa/flow/sign_up.rb b/qa/qa/flow/sign_up.rb
index ec7886ef969..52c92293bad 100644
--- a/qa/qa/flow/sign_up.rb
+++ b/qa/qa/flow/sign_up.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module SignUp
-      module_function
+      extend self
 
       def page
         Capybara.current_session
@@ -55,3 +55,5 @@ module QA
     end
   end
 end
+
+QA::Flow::SignUp.prepend_mod_with('Flow::SignUp', namespace: QA)
diff --git a/qa/qa/flow/user.rb b/qa/qa/flow/user.rb
index c0bd475adb7..8f11d4ef26f 100644
--- a/qa/qa/flow/user.rb
+++ b/qa/qa/flow/user.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module User
-      module_function
+      extend self
 
       def page
         Capybara.current_session
@@ -24,3 +24,5 @@ module QA
     end
   end
 end
+
+QA::Flow::User.prepend_mod_with('Flow::User', namespace: QA)
diff --git a/qa/qa/flow/user_onboarding.rb b/qa/qa/flow/user_onboarding.rb
index 066e1878869..62397d5641d 100644
--- a/qa/qa/flow/user_onboarding.rb
+++ b/qa/qa/flow/user_onboarding.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module UserOnboarding
-      module_function
+      extend self
 
       def onboard_user
         Page::Registration::Welcome.perform do |welcome_page|
@@ -17,3 +17,5 @@ module QA
     end
   end
 end
+
+QA::Flow::UserOnboarding.prepend_mod_with('Flow::UserOnboarding', namespace: QA)