diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 06:06:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 06:06:16 +0000 |
commit | 0282449e6ea95b54b32acfd2de24c8c5f64a8165 (patch) | |
tree | 017b43b103e45ff571d637a5efc77b5ed25c0686 /spec/models/environment_spec.rb | |
parent | 0ecdcf59f4342de55a7d2c3ee4ac0d9c3b116aa5 (diff) | |
download | gitlab-ce-0282449e6ea95b54b32acfd2de24c8c5f64a8165.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/environment_spec.rb')
-rw-r--r-- | spec/models/environment_spec.rb | 8 |
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 |