summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-03-15 12:51:47 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-03-15 12:51:47 +0000
commit0e1c67d15cc2042907cd7e2ed2fb40f2b476a33c (patch)
tree3a7c411cac16c50f644acb2851dfd21bf9a05cdd
parentbd5510539b6130938b25227c7010aaca1ad49fb8 (diff)
parent4b039e5d285944d708030179b543cdc9c455fbca (diff)
downloadgitlab-ce-0e1c67d15cc2042907cd7e2ed2fb40f2b476a33c.tar.gz
Merge branch 'rs-ci-build-spec-warnings' into 'master'
Remove RSpec warnings from `spec/models/ci/build_spec.rb` See merge request gitlab-org/gitlab-ce!17755
-rw-r--r--spec/models/ci/build_spec.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 6e202de0db9..3b8cf16ee1a 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -679,21 +679,21 @@ describe Ci::Build do
describe '#erase' do
before do
- build.erase(erased_by: user)
+ build.erase(erased_by: erased_by)
end
context 'erased by user' do
- let!(:user) { create(:user, username: 'eraser') }
+ let!(:erased_by) { create(:user, username: 'eraser') }
include_examples 'erasable'
it 'records user who erased a build' do
- expect(build.erased_by).to eq user
+ expect(build.erased_by).to eq erased_by
end
end
context 'erased by system' do
- let(:user) { nil }
+ let(:erased_by) { nil }
include_examples 'erasable'
@@ -748,21 +748,21 @@ describe Ci::Build do
describe '#erase' do
before do
- build.erase(erased_by: user)
+ build.erase(erased_by: erased_by)
end
context 'erased by user' do
- let!(:user) { create(:user, username: 'eraser') }
+ let!(:erased_by) { create(:user, username: 'eraser') }
include_examples 'erasable'
it 'records user who erased a build' do
- expect(build.erased_by).to eq user
+ expect(build.erased_by).to eq erased_by
end
end
context 'erased by system' do
- let(:user) { nil }
+ let(:erased_by) { nil }
include_examples 'erasable'
@@ -1958,7 +1958,7 @@ describe Ci::Build do
context 'when depended job has not been completed yet' do
let!(:pre_stage_job) { create(:ci_build, :manual, pipeline: pipeline, name: 'test', stage_idx: 0) }
- it { expect { job.run! }.not_to raise_error(Ci::Build::MissingDependenciesError) }
+ it { expect { job.run! }.not_to raise_error }
end
context 'when artifacts of depended job has been expired' do