Add latest changes from gitlab-org/gitlab@master

6 files changed, 10 insertions, 20 deletions

diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index 3dcea451995..40df4afb887 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -192,7 +192,7 @@ To add seats to a subscription:
 1. Select **Add more seats** on the relevant subscription card.
 1. Enter the number of additional users.
 1. Review the **Purchase summary** section. The system lists the total price for all users on the
-   system and a credit for what you've already paid. You are only be charged for the net change.
+   system and a credit for what you've already paid. You are only charged for the net change.
 1. Enter your payment information.
 1. Select **Purchase seats**.
 
diff --git a/qa/qa/ce/strategy.rb b/qa/qa/ce/strategy.rb
index 24398e8eace..d936640abfb 100644
--- a/qa/qa/ce/strategy.rb
+++ b/qa/qa/ce/strategy.rb
@@ -20,10 +20,10 @@ module QA
           )
         end
 
-        QA::Runtime::Logger.info("Browser: #{QA::Runtime::Env.browser}")
+        QA::Runtime::Logger.info("Using Browser: #{QA::Runtime::Env.browser}")
 
         if QA::Runtime::Env.use_selenoid?
-          QA::Runtime::Logger.info("Browser version: #{QA::Runtime::Env.selenoid_browser_version}")
+          QA::Runtime::Logger.info("Using Selenoid Browser version: #{QA::Runtime::Env.selenoid_browser_version}")
         end
 
         # The login page could take some time to load the first time it is visited.
diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb
index ce970d02e0a..1fad0b76645 100644
--- a/qa/qa/runtime/browser.rb
+++ b/qa/qa/runtime/browser.rb
@@ -43,6 +43,7 @@ module QA
       end
 
       def self.configure! # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        return if QA::Runtime::Env.dry_run
         return if @configured
 
         RSpec.configure do |config|
diff --git a/qa/qa/scenario/template.rb b/qa/qa/scenario/template.rb
index e7749ffe209..92c852e9010 100644
--- a/qa/qa/scenario/template.rb
+++ b/qa/qa/scenario/template.rb
@@ -32,16 +32,6 @@ module QA
         # Set large setup attribute
         Runtime::Scenario.define(:large_setup?, args.include?('can_use_large_setup'))
 
-        ##
-        # Configure browser
-        #
-        Runtime::Browser.configure!
-
-        ##
-        # Perform before hooks, which are different for CE and EE
-        #
-        QA::Runtime::Release.perform_before_hooks unless QA::Runtime::Env.dry_run
-
         Specs::Runner.perform do |specs|
           specs.tty = true
           specs.tags = self.class.focus
diff --git a/qa/qa/specs/spec_helper.rb b/qa/qa/specs/spec_helper.rb
index 27ac7224052..e259c1fec50 100644
--- a/qa/qa/specs/spec_helper.rb
+++ b/qa/qa/specs/spec_helper.rb
@@ -14,7 +14,7 @@ Knapsack::Adapters::RSpecAdapter.bind if QA::Runtime::Env.knapsack?
 
 # TODO: move all classes that perform rspec configuration under spec/helpers
 QA::Support::GitlabAddress.define_gitlab_address_attribute!
-QA::Runtime::Browser.configure! unless QA::Runtime::Env.dry_run
+QA::Runtime::Browser.configure!
 QA::Specs::Helpers::FeatureSetup.configure!
 QA::Runtime::AllureReport.configure!
 QA::Runtime::Scenario.from_env(QA::Runtime::Env.runtime_scenario_attributes)
@@ -51,6 +51,11 @@ RSpec.configure do |config|
     Thread.current[:browser_ui_fabrication] = 0
   end
 
+  config.prepend_before(:suite) do
+    # Perform before hooks at the very start of the test run
+    QA::Runtime::Release.perform_before_hooks unless QA::Runtime::Env.dry_run
+  end
+
   config.before(:suite) do
     FactoryBot.find_definitions
   end
diff --git a/qa/spec/scenario_shared_examples.rb b/qa/spec/scenario_shared_examples.rb
index 944e309c4cb..968bbfdd7dd 100644
--- a/qa/spec/scenario_shared_examples.rb
+++ b/qa/spec/scenario_shared_examples.rb
@@ -28,12 +28,6 @@ module QA
       expect(subject).to respond_to(:perform)
     end
 
-    it 'performs before hooks only once' do
-      subject.perform(args)
-
-      expect(release).to have_received(:perform_before_hooks).once
-    end
-
     it 'sets tags on runner' do
       subject.perform(args)