diff options
author | Shinya Maeda <shinya@gitlab.com> | 2019-02-24 15:39:27 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-01 14:03:56 +0900 |
commit | 13ec2fb033aa09cdc6db6968721edc1c377bc7f9 (patch) | |
tree | 6c7865db56e15a71b0382b608a09c08b0117411d /spec | |
parent | c994484d17d6a6da929f6a52f1b64dc15c38835c (diff) | |
download | gitlab-ce-refactor-merge-request-pipeline-relations.tar.gz |
Refactor merge request pipeline relationsrefactor-merge-request-pipeline-relations
Improve
Fix more
Fix
Remove unnecessary
Simplify more
Improve
ok
ok
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/ci/build_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 81ff727b458..50c90f00b43 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1648,13 +1648,13 @@ describe Ci::Build do end it 'returns the single associated MR' do - expect(build.merge_request.id).to eq(@merge_request.id) + expect(build.first_merge_request.id).to eq(@merge_request.id) end end context 'when there is not a MR referencing the pipeline' do it 'returns nil' do - expect(build.merge_request).to be_nil + expect(build.first_merge_request).to be_nil end end @@ -1671,7 +1671,7 @@ describe Ci::Build do end it 'returns the first MR' do - expect(build.merge_request.id).to eq(@merge_request.id) + expect(build.first_merge_request.id).to eq(@merge_request.id) end end |