diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 06:07:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 06:07:46 +0300 |
commit | b24ae1cbc66e5b0f622393bcf2c59711750161ea (patch) | |
tree | de9514fdda81f7d8293612687026a87826b0d9dd /spec/workers/deployments | |
parent | 775816e676aae53509d7b6f364945f2720636f72 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/deployments')
-rw-r--r-- | spec/workers/deployments/finished_worker_spec.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/workers/deployments/finished_worker_spec.rb b/spec/workers/deployments/finished_worker_spec.rb index f0e3439fdfa..2961ff599c3 100644 --- a/spec/workers/deployments/finished_worker_spec.rb +++ b/spec/workers/deployments/finished_worker_spec.rb @@ -49,17 +49,5 @@ describe Deployments::FinishedWorker do expect(ProjectServiceWorker).not_to have_received(:perform_async) end - - context 'when the tracking of merge requests is disabled' do - it 'does not track the deployed merge requests' do - stub_feature_flags(deployment_merge_requests: false) - - deployment = create(:deployment) - - expect(Deployments::LinkMergeRequestsService).not_to receive(:new) - - worker.perform(deployment.id) - end - end end end |