2 files changed, 116 insertions, 18 deletions
diff --git a/qa/spec/specs/parallel_runner_spec.rb b/qa/spec/specs/parallel_runner_spec.rb
new file mode 100644
index 00000000000..67d94a1f648
--- /dev/null
+++ b/qa/spec/specs/parallel_runner_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+describe QA::Specs::ParallelRunner do
+  include Helpers::StubENV
+
+  before do
+    allow(QA::Runtime::Scenario).to receive(:attributes).and_return(parallel: true)
+    stub_env('GITLAB_QA_ACCESS_TOKEN', 'skip_token_creation')
+  end
+
+  it 'passes args to parallel_tests' do
+    expect_cli_arguments(['--tag', '~orchestrated', *QA::Specs::Runner::DEFAULT_TEST_PATH_ARGS])
+
+    subject.run(['--tag', '~orchestrated', *QA::Specs::Runner::DEFAULT_TEST_PATH_ARGS])
+  end
+
+  it 'passes a given test path to parallel_tests and adds a separator' do
+    expect_cli_arguments(%w[-- qa/specs/features/foo])
+
+    subject.run(%w[qa/specs/features/foo])
+  end
+
+  it 'passes tags and test paths to parallel_tests and adds a separator' do
+    expect_cli_arguments(%w[--tag smoke -- qa/specs/features/foo qa/specs/features/bar])
+
+    subject.run(%w[--tag smoke qa/specs/features/foo qa/specs/features/bar])
+  end
+
+  it 'passes tags and test paths with separators to parallel_tests' do
+    expect_cli_arguments(%w[-- --tag smoke -- qa/specs/features/foo qa/specs/features/bar])
+
+    subject.run(%w[-- --tag smoke -- qa/specs/features/foo qa/specs/features/bar])
+  end
+
+  it 'passes supported environment variables' do
+    # Test only env vars starting with GITLAB because some of the others
+    # affect how the runner behaves, and we're not concerned with those
+    # behaviors in this test
+    gitlab_env_vars = QA::Runtime::Env::ENV_VARIABLES.reject { |v| !v.start_with?('GITLAB') }
+
+    gitlab_env_vars.each do |k, v|
+      stub_env(k, v)
+    end
+
+    gitlab_env_vars['QA_RUNTIME_SCENARIO_ATTRIBUTES'] = '{"parallel":true}'
+
+    expect_cli_arguments([], gitlab_env_vars)
+
+    subject.run([])
+  end
+
+  def expect_cli_arguments(arguments, env = { 'QA_RUNTIME_SCENARIO_ATTRIBUTES' => '{"parallel":true}' })
+    cmd = "bundle exec parallel_test -t rspec --combine-stderr --serialize-stdout -- #{arguments.join(' ')}"
+    expect(Open3).to receive(:popen2e)
+      .with(hash_including(env), cmd)
+      .and_return(0)
+  end
+end
diff --git a/qa/spec/specs/runner_spec.rb b/qa/spec/specs/runner_spec.rb
index 5c86c102105..3d98f03a982 100644
--- a/qa/spec/specs/runner_spec.rb
+++ b/qa/spec/specs/runner_spec.rb
@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/hash'
+
 describe QA::Specs::Runner do
+  shared_examples 'excludes orchestrated' do
+    it 'excludes the orchestrated tag and includes default args' do
+      expect_rspec_runner_arguments(['--tag', '~orchestrated', *described_class::DEFAULT_TEST_PATH_ARGS])
+
+      subject.perform
+    end
+  end
+
   context '#perform' do
     before do
       allow(QA::Runtime::Browser).to receive(:configure!)
     end
 
-    it 'excludes the orchestrated tag by default' do
-      expect_rspec_runner_arguments(['--tag', '~orchestrated', *described_class::DEFAULT_TEST_PATH_ARGS])
-
-      subject.perform
-    end
+    it_behaves_like 'excludes orchestrated'
 
     context 'when tty is set' do
       subject { described_class.new.tap { |runner| runner.tty = true } }
@@ -52,11 +58,11 @@ describe QA::Specs::Runner do
       end
     end
 
-    context 'when "-- qa/specs/features/foo" is set as options' do
-      subject { described_class.new.tap { |runner| runner.options = %w[-- qa/specs/features/foo] } }
+    context 'when "--tag smoke" and "qa/specs/features/foo" are set as options' do
+      subject { described_class.new.tap { |runner| runner.options = %w[--tag smoke qa/specs/features/foo] } }
 
-      it 'passes the given tests path and excludes the orchestrated tag' do
-        expect_rspec_runner_arguments(['--tag', '~orchestrated', '--', 'qa/specs/features/foo'])
+      it 'focuses on the given tag and includes the path without excluding the orchestrated tag' do
+        expect_rspec_runner_arguments(['--tag', 'smoke', 'qa/specs/features/foo'])
 
         subject.perform
       end
@@ -67,8 +73,6 @@ describe QA::Specs::Runner do
         allow(QA::Runtime::Env).to receive(:signup_disabled?).and_return(true)
       end
 
-      subject { described_class.new }
-
       it 'includes default args and excludes the skip_signup_disabled tag' do
         expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~skip_signup_disabled', *described_class::DEFAULT_TEST_PATH_ARGS])
 
@@ -76,17 +80,53 @@ describe QA::Specs::Runner do
       end
     end
 
-    context 'when git protocol v2 is not supported' do
-      before do
-        allow(QA::Runtime::Env).to receive(:can_test?).with(:git_protocol_v2).and_return(false)
+    context 'testable features' do
+      shared_examples 'one supported feature' do |feature|
+        before do
+          QA::Runtime::Env.supported_features.each do |tag, _|
+            allow(QA::Runtime::Env).to receive(:can_test?).with(tag).and_return(false)
+          end
+
+          allow(QA::Runtime::Env).to receive(:can_test?).with(feature).and_return(true) unless feature.nil?
+        end
+
+        it 'includes default args and excludes all unsupported tags' do
+          expect_rspec_runner_arguments(['--tag', '~orchestrated', *excluded_feature_tags_except(feature), *described_class::DEFAULT_TEST_PATH_ARGS])
+
+          subject.perform
+        end
       end
 
-      subject { described_class.new }
+      context 'when only git protocol 2 is supported' do
+        it_behaves_like 'one supported feature', :git_protocol_v2
+      end
 
-      it 'includes default args and excludes the requires_git_protocol_v2 tag' do
-        expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~requires_git_protocol_v2', *described_class::DEFAULT_TEST_PATH_ARGS])
+      context 'when only admin features are supported' do
+        it_behaves_like 'one supported feature', :admin
+      end
 
-        subject.perform
+      context 'when no features are supported' do
+        it_behaves_like 'one supported feature', nil
+      end
+
+      context 'when all features are supported' do
+        before do
+          QA::Runtime::Env.supported_features.each do |tag, _|
+            allow(QA::Runtime::Env).to receive(:can_test?).with(tag).and_return(true)
+          end
+        end
+
+        it_behaves_like 'excludes orchestrated'
+      end
+
+      context 'when features are not specified' do
+        it_behaves_like 'excludes orchestrated'
+      end
+    end
+
+    def excluded_feature_tags_except(tag)
+      QA::Runtime::Env.supported_features.except(tag).flat_map do |tag, _|
+        ['--tag', "~requires_#{tag}"]
       end
     end