diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-03-22 16:36:14 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-05-08 11:26:04 -0300 |
| commit | 24824cbb4c6d2c5ebd08dea03007f65c5df763da (patch) | |
| tree | 618cc1a50e76126e4aff941bd538a31917e5282b /spec/models/ci | |
| parent | 85f0b3a984048d1e5d146a233612a0bc96f12b5c (diff) | |
| download | gitlab-ce-24824cbb4c6d2c5ebd08dea03007f65c5df763da.tar.gz | |
Fix Specs
Diffstat (limited to 'spec/models/ci')
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 208c8cb1c3d..86ed37b50aa 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1044,8 +1044,8 @@ describe Ci::Pipeline, models: true do let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master', sha: 'a288a022a53a5a944fae87bcec6efc87b7061808') } it "returns merge requests whose `diff_head_sha` matches the pipeline's SHA" do - merge_request = create(:merge_request, source_project: project, source_branch: pipeline.ref) allow_any_instance_of(MergeRequest).to receive(:diff_head_sha) { 'a288a022a53a5a944fae87bcec6efc87b7061808' } + merge_request = create(:merge_request, source_project: project, head_pipeline: pipeline, , source_branch: pipeline.ref) expect(pipeline.merge_requests).to eq([merge_request]) end |