Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 47e39e5fbe5..e1e4af63ef3 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -484,7 +484,9 @@ describe Environment, :use_clean_rails_memory_store_caching do
     subject { environment.last_deployment }
 
     before do
-      allow_any_instance_of(Deployment).to receive(:create_ref)
+      allow_next_instance_of(Deployment) do |instance|
+        allow(instance).to receive(:create_ref)
+      end
     end
 
     context 'when there is an old deployment record' do
@@ -1031,7 +1033,9 @@ describe Environment, :use_clean_rails_memory_store_caching do
 
   describe '#prometheus_adapter' do
     it 'calls prometheus adapter service' do
-      expect_any_instance_of(Prometheus::AdapterService).to receive(:prometheus_adapter)
+      expect_next_instance_of(Prometheus::AdapterService) do |instance|
+        expect(instance).to receive(:prometheus_adapter)
+      end
 
       subject.prometheus_adapter
     end