1 files changed, 31 insertions, 15 deletions
diff --git a/qa/spec/specs/runner_spec.rb b/qa/spec/specs/runner_spec.rb
index 8171cfcb3e6..b11054f0bd9 100644
--- a/qa/spec/specs/runner_spec.rb
+++ b/qa/spec/specs/runner_spec.rb
@@ -3,9 +3,9 @@
 require 'active_support/core_ext/hash'
 
 RSpec.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])
+  shared_examples 'excludes orchestrated and geo' do
+    it 'excludes the orchestrated and geo tags and includes default args' do
+      expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~geo', *described_class::DEFAULT_TEST_PATH_ARGS])
 
       subject.perform
     end
@@ -18,13 +18,13 @@ RSpec.describe QA::Specs::Runner do
       QA::Runtime::Scenario.define(:gitlab_address, "http://gitlab.test")
     end
 
-    it_behaves_like 'excludes orchestrated'
+    it_behaves_like 'excludes orchestrated and geo'
 
     context 'when tty is set' do
       subject { described_class.new.tap { |runner| runner.tty = true } }
 
       it 'sets the `--tty` flag' do
-        expect_rspec_runner_arguments(['--tty', '--tag', '~orchestrated', *described_class::DEFAULT_TEST_PATH_ARGS])
+        expect_rspec_runner_arguments(['--tty', '--tag', '~orchestrated', '--tag', '~geo', *described_class::DEFAULT_TEST_PATH_ARGS])
 
         subject.perform
       end
@@ -34,7 +34,7 @@ RSpec.describe QA::Specs::Runner do
       subject { described_class.new.tap { |runner| runner.tags = %i[orchestrated github] } }
 
       it 'focuses on the given tags' do
-        expect_rspec_runner_arguments(['--tag', 'orchestrated', '--tag', 'github', *described_class::DEFAULT_TEST_PATH_ARGS])
+        expect_rspec_runner_arguments(['--tag', 'orchestrated', '--tag', 'github', '--tag', '~geo', *described_class::DEFAULT_TEST_PATH_ARGS])
 
         subject.perform
       end
@@ -44,7 +44,7 @@ RSpec.describe QA::Specs::Runner do
       subject { described_class.new.tap { |runner| runner.options = %w[--tag smoke] } }
 
       it 'focuses on the given tag without excluded the orchestrated tag' do
-        expect_rspec_runner_arguments(['--tag', 'smoke', *described_class::DEFAULT_TEST_PATH_ARGS])
+        expect_rspec_runner_arguments(['--tag', '~geo', '--tag', 'smoke', *described_class::DEFAULT_TEST_PATH_ARGS])
 
         subject.perform
       end
@@ -53,8 +53,8 @@ RSpec.describe QA::Specs::Runner do
     context 'when "qa/specs/features/foo" is set as options' do
       subject { described_class.new.tap { |runner| runner.options = %w[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 'passes the given tests path and excludes the orchestrated and geo tags' do
+        expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~geo', 'qa/specs/features/foo'])
 
         subject.perform
       end
@@ -64,7 +64,7 @@ RSpec.describe QA::Specs::Runner do
       subject { described_class.new.tap { |runner| runner.options = %w[--tag smoke 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'])
+        expect_rspec_runner_arguments(['--tag', '~geo', '--tag', 'smoke', 'qa/specs/features/foo'])
 
         subject.perform
       end
@@ -76,7 +76,7 @@ RSpec.describe QA::Specs::Runner do
       end
 
       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])
+        expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~geo', '--tag', '~skip_signup_disabled', *described_class::DEFAULT_TEST_PATH_ARGS])
 
         subject.perform
       end
@@ -88,8 +88,24 @@ RSpec.describe QA::Specs::Runner do
       end
 
       it 'includes default args and excludes the skip_live_env tag' do
-        expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~skip_live_env', *described_class::DEFAULT_TEST_PATH_ARGS])
+        expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~geo', '--tag', '~skip_live_env', *described_class::DEFAULT_TEST_PATH_ARGS])
+        subject.perform
+      end
+    end
+
+    context 'when running against a Geo environment' do
+      before do
+        QA::Runtime::Scenario.define(:geo_secondary_address, "https://geo.staging.gitlab.com")
+      end
+
+      after do
+        QA::Runtime::Scenario.attributes.delete(:geo_secondary_address)
+      end
+
+      subject { described_class.new.tap { |runner| runner.tags = %i[geo] } }
 
+      it 'includes the geo tag' do
+        expect_rspec_runner_arguments(['--tag', 'geo', *described_class::DEFAULT_TEST_PATH_ARGS])
         subject.perform
       end
     end
@@ -105,7 +121,7 @@ RSpec.describe QA::Specs::Runner do
         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])
+          expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~geo', *excluded_feature_tags_except(feature), *described_class::DEFAULT_TEST_PATH_ARGS])
 
           subject.perform
         end
@@ -130,11 +146,11 @@ RSpec.describe QA::Specs::Runner do
           end
         end
 
-        it_behaves_like 'excludes orchestrated'
+        it_behaves_like 'excludes orchestrated and geo'
       end
 
       context 'when features are not specified' do
-        it_behaves_like 'excludes orchestrated'
+        it_behaves_like 'excludes orchestrated and geo'
       end
     end