Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 0 insertions, 8 deletions

diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 3e855584c38..9afacd518af 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -114,14 +114,6 @@ RSpec.describe Deployment do
         deployment.run!
       end
 
-      it 'does not execute Deployments::ExecuteHooksWorker when feature is disabled' do
-        stub_feature_flags(ci_send_deployment_hook_when_start: false)
-        expect(Deployments::ExecuteHooksWorker)
-            .not_to receive(:perform_async).with(deployment.id)
-
-        deployment.run!
-      end
-
       it 'executes Deployments::DropOlderDeploymentsWorker asynchronously' do
         expect(Deployments::DropOlderDeploymentsWorker)
             .to receive(:perform_async).once.with(deployment.id)