Add latest changes from gitlab-org/gitlab@master

7 files changed, 16 insertions, 31 deletions

diff --git a/spec/lib/backup/gitaly_backup_spec.rb b/spec/lib/backup/gitaly_backup_spec.rb
index 7cc8ce2cbae..ad0e5553fa1 100644
--- a/spec/lib/backup/gitaly_backup_spec.rb
+++ b/spec/lib/backup/gitaly_backup_spec.rb
@@ -17,7 +17,8 @@ RSpec.describe Backup::GitalyBackup do
   let(:expected_env) do
     {
       'SSL_CERT_FILE' => Gitlab::X509::Certificate.default_cert_file,
-      'SSL_CERT_DIR' => Gitlab::X509::Certificate.default_cert_dir
+      'SSL_CERT_DIR' => Gitlab::X509::Certificate.default_cert_dir,
+      'GITALY_SERVERS' => anything
     }.merge(ENV)
   end
 
@@ -125,12 +126,18 @@ RSpec.describe Backup::GitalyBackup do
         }
       end
 
+      let(:expected_env) do
+        ssl_env.merge(
+          'GITALY_SERVERS' => anything
+        )
+      end
+
       before do
         stub_const('ENV', ssl_env)
       end
 
       it 'passes through SSL envs' do
-        expect(Open3).to receive(:popen2).with(ssl_env, anything, 'create', '-path', anything, '-layout', 'pointer', '-id', backup_id).and_call_original
+        expect(Open3).to receive(:popen2).with(expected_env, anything, 'create', '-path', anything, '-layout', 'pointer', '-id', backup_id).and_call_original
 
         subject.start(:create, destination, backup_id: backup_id)
         subject.finish!
diff --git a/spec/lib/gitlab/content_security_policy/config_loader_spec.rb b/spec/lib/gitlab/content_security_policy/config_loader_spec.rb
index f298890623f..b40829d72a0 100644
--- a/spec/lib/gitlab/content_security_policy/config_loader_spec.rb
+++ b/spec/lib/gitlab/content_security_policy/config_loader_spec.rb
@@ -102,11 +102,7 @@ RSpec.describe Gitlab::ContentSecurityPolicy::ConfigLoader do
     end
 
     describe 'Zuora directives' do
-      context 'when is Gitlab.com?' do
-        before do
-          allow(::Gitlab).to receive(:com?).and_return(true)
-        end
-
+      context 'when on SaaS', :saas do
         it 'adds Zuora host to CSP' do
           expect(directives['frame_src']).to include('https://*.zuora.com/apps/PublicHostedPageLite.do')
         end
diff --git a/spec/lib/gitlab/email/message/build_ios_app_guide_spec.rb b/spec/lib/gitlab/email/message/build_ios_app_guide_spec.rb
index 3089f955252..4b77b2f7192 100644
--- a/spec/lib/gitlab/email/message/build_ios_app_guide_spec.rb
+++ b/spec/lib/gitlab/email/message/build_ios_app_guide_spec.rb
@@ -2,13 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Email::Message::BuildIosAppGuide do
+RSpec.describe Gitlab::Email::Message::BuildIosAppGuide, :saas do
   subject(:message) { described_class.new }
 
-  before do
-    allow(Gitlab).to receive(:com?) { true }
-  end
-
   it 'contains the correct message', :aggregate_failures do
     expect(message.subject_line).to eq 'Get set up to build for iOS'
     expect(message.title).to eq "Building for iOS? We've got you covered."
diff --git a/spec/lib/gitlab/email/message/in_product_marketing/helper_spec.rb b/spec/lib/gitlab/email/message/in_product_marketing/helper_spec.rb
index 3c0d83d0f9e..a3c2d1b428e 100644
--- a/spec/lib/gitlab/email/message/in_product_marketing/helper_spec.rb
+++ b/spec/lib/gitlab/email/message/in_product_marketing/helper_spec.rb
@@ -27,11 +27,7 @@ RSpec.describe Gitlab::Email::Message::InProductMarketing::Helper do
 
     subject(:class_with_helper) { dummy_class_with_helper.new(format) }
 
-    context 'gitlab.com' do
-      before do
-        allow(Gitlab).to receive(:com?) { true }
-      end
-
+    context 'for SaaS', :saas do
       context 'format is HTML' do
         it 'returns the correct HTML' do
           message = "If you no longer wish to receive marketing emails from us, " \
diff --git a/spec/lib/gitlab/monitor/demo_projects_spec.rb b/spec/lib/gitlab/monitor/demo_projects_spec.rb
index 262c78eb62e..6b0f855e38d 100644
--- a/spec/lib/gitlab/monitor/demo_projects_spec.rb
+++ b/spec/lib/gitlab/monitor/demo_projects_spec.rb
@@ -6,15 +6,13 @@ RSpec.describe Gitlab::Monitor::DemoProjects do
   describe '#primary_keys' do
     subject { described_class.primary_keys }
 
-    it 'fetches primary_keys when on gitlab.com' do
-      allow(Gitlab).to receive(:com?).and_return(true)
+    it 'fetches primary_keys when on SaaS', :saas do
       allow(Gitlab).to receive(:staging?).and_return(false)
 
       expect(subject).to eq(Gitlab::Monitor::DemoProjects::DOT_COM_IDS)
     end
 
-    it 'fetches primary_keys when on staging' do
-      allow(Gitlab).to receive(:com?).and_return(true)
+    it 'fetches primary_keys when on staging', :saas do
       allow(Gitlab).to receive(:staging?).and_return(true)
 
       expect(subject).to eq(Gitlab::Monitor::DemoProjects::STAGING_IDS)
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/count_ci_internal_pipelines_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/count_ci_internal_pipelines_metric_spec.rb
index 21d4e7690a1..77c49d448d7 100644
--- a/spec/lib/gitlab/usage/metrics/instrumentations/count_ci_internal_pipelines_metric_spec.rb
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/count_ci_internal_pipelines_metric_spec.rb
@@ -17,11 +17,7 @@ feature_category: :service_ping do
     it_behaves_like 'a correct instrumented metric value', { time_frame: '28d', data_source: 'database' }
   end
 
-  context 'on Gitlab.com' do
-    before do
-      allow(Gitlab).to receive(:com?).and_return(true)
-    end
-
+  context 'on SaaS', :saas do
     let_it_be(:expected_value) { -1 }
 
     it_behaves_like 'a correct instrumented metric value', { time_frame: 'all', data_source: 'database' }
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/count_issues_created_manually_from_alerts_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/count_issues_created_manually_from_alerts_metric_spec.rb
index 86f54c48666..65e514bf345 100644
--- a/spec/lib/gitlab/usage/metrics/instrumentations/count_issues_created_manually_from_alerts_metric_spec.rb
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/count_issues_created_manually_from_alerts_metric_spec.rb
@@ -16,11 +16,7 @@ feature_category: :service_ping do
 
   it_behaves_like 'a correct instrumented metric value', { time_frame: 'all', data_source: 'database' }
 
-  context 'on Gitlab.com' do
-    before do
-      allow(Gitlab).to receive(:com?).and_return(true)
-    end
-
+  context 'on SaaS', :saas do
     let(:expected_value) { -1 }
 
     it_behaves_like 'a correct instrumented metric value', { time_frame: 'all', data_source: 'database' }