Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 8 deletions

diff --git a/qa/spec/specs/helpers/context_selector_spec.rb b/qa/spec/specs/helpers/context_selector_spec.rb
index 3c09f938684..f6134cc6177 100644
--- a/qa/spec/specs/helpers/context_selector_spec.rb
+++ b/qa/spec/specs/helpers/context_selector_spec.rb
@@ -75,7 +75,7 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
         QA::Runtime::Scenario.define(:gitlab_address, "https://jihulab.com/")
         expect(described_class.context_matches?(:production)).to be_truthy
 
-        QA::Runtime::Scenario.define(:gitlab_address, "https://jihulab.hk/")
+        QA::Runtime::Scenario.define(:gitlab_address, "https://gitlab.hk/")
         expect(described_class.context_matches?(:production)).to be_truthy
       end
 
@@ -101,12 +101,12 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
           expect(described_class.context_matches?(domain: 'jihulab')).to be_truthy
         end
 
-        QA::Runtime::Scenario.define(:gitlab_address, 'https://jihulab.hk')
+        QA::Runtime::Scenario.define(:gitlab_address, 'https://gitlab.hk')
 
         aggregate_failures do
           expect(described_class.context_matches?(:production)).to be_truthy
-          expect(described_class.context_matches?(domain: 'gitlab')).to be_falsey
-          expect(described_class.context_matches?(domain: 'jihulab')).to be_truthy
+          expect(described_class.context_matches?(domain: 'jihulab')).to be_falsey
+          expect(described_class.context_matches?(domain: 'gitlab')).to be_truthy
         end
       end
 
@@ -384,14 +384,14 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
   context 'jh hk production ' do
     before do
       allow(GitlabEdition).to receive(:jh?).and_return(true)
-      QA::Runtime::Scenario.define(:gitlab_address, 'https://jihulab.hk/')
+      QA::Runtime::Scenario.define(:gitlab_address, 'https://gitlab.hk/')
     end
 
     it 'runs on production' do
       group = describe_successfully do
         it('runs on prod', only: :production) {}
         it('does not run in prod', only: { subdomain: :staging }) {}
-        it('runs in prod and staging', only: { subdomain: /(staging.)?/, domain: 'jihulab' }) {}
+        it('runs in prod and staging', only: { subdomain: /(staging.)?/, domain: 'gitlab' }) {}
       end
 
       aggregate_failures do
@@ -406,7 +406,7 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
         group = describe_successfully do
           it('skips prod', except: :production) {}
           it('runs on prod', except: { subdomain: :staging }) {}
-          it('skips prod and staging', except: { subdomain: /(staging.)?/, domain: 'jihulab' }) {}
+          it('skips prod and staging', except: { subdomain: /(staging.)?/, domain: 'gitlab' }) {}
         end
 
         aggregate_failures do
diff --git a/qa/spec/specs/helpers/feature_flag_spec.rb b/qa/spec/specs/helpers/feature_flag_spec.rb
index 180890b2701..e9f64dab587 100644
--- a/qa/spec/specs/helpers/feature_flag_spec.rb
+++ b/qa/spec/specs/helpers/feature_flag_spec.rb
@@ -187,7 +187,7 @@ RSpec.describe QA::Specs::Helpers::FeatureFlag do
       end
 
       before(:context) do
-        QA::Runtime::Scenario.define(:gitlab_address, 'https://jihulab.hk')
+        QA::Runtime::Scenario.define(:gitlab_address, 'https://gitlab.hk')
       end
 
       context 'when no scope is defined' do