Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-20 09:06:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-20 09:06:16 +0300
commit0282449e6ea95b54b32acfd2de24c8c5f64a8165 (patch)
tree017b43b103e45ff571d637a5efc77b5ed25c0686 /spec/uploaders
parent0ecdcf59f4342de55a7d2c3ee4ac0d9c3b116aa5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/uploaders')
-rw-r--r--spec/uploaders/object_storage_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb
index 37b107ee36e..2f2ed28891a 100644
--- a/spec/uploaders/object_storage_spec.rb
+++ b/spec/uploaders/object_storage_spec.rb
@@ -151,7 +151,9 @@ describe ObjectStorage do
describe 'fails' do
it 'is handled gracefully' do
store = uploader.object_store
- expect_any_instance_of(Upload).to receive(:save!).and_raise("An error")
+ expect_next_instance_of(Upload) do |instance|
+ expect(instance).to receive(:save!).and_raise("An error")
+ end
expect { subject }.to raise_error("An error")
expect(uploader.exists?).to be_truthy