Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 6 deletions

diff --git a/spec/workers/gitlab_service_ping_worker_spec.rb b/spec/workers/gitlab_service_ping_worker_spec.rb
index f17847a7b33..034662864df 100644
--- a/spec/workers/gitlab_service_ping_worker_spec.rb
+++ b/spec/workers/gitlab_service_ping_worker_spec.rb
@@ -14,15 +14,13 @@ RSpec.describe GitlabServicePingWorker, :clean_gitlab_redis_shared_state do
     allow(subject).to receive(:sleep)
   end
 
-  it 'does not run for GitLab.com when triggered from cron' do
-    allow(Gitlab).to receive(:com?).and_return(true)
+  it 'does not run for SaaS when triggered from cron', :saas do
     expect(ServicePing::SubmitService).not_to receive(:new)
 
     subject.perform
   end
 
-  it 'runs for GitLab.com when triggered manually' do
-    allow(Gitlab).to receive(:com?).and_return(true)
+  it 'runs for SaaS when triggered manually', :saas do
     expect(ServicePing::SubmitService).to receive(:new)
 
     subject.perform('triggered_from_cron' => false)
diff --git a/spec/workers/users/deactivate_dormant_users_worker_spec.rb b/spec/workers/users/deactivate_dormant_users_worker_spec.rb
index a8318de669b..c7fde3376f2 100644
--- a/spec/workers/users/deactivate_dormant_users_worker_spec.rb
+++ b/spec/workers/users/deactivate_dormant_users_worker_spec.rb
@@ -12,8 +12,7 @@ RSpec.describe Users::DeactivateDormantUsersWorker do
 
     subject(:worker) { described_class.new }
 
-    it 'does not run for GitLab.com' do
-      expect(Gitlab).to receive(:com?).and_return(true)
+    it 'does not run for SaaS', :saas do
       # Now makes a call to current settings to determine period of dormancy
 
       worker.perform