diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-10 18:57:19 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-10 18:57:19 +0000 |
| commit | 9c7d87ef0ec941b389cb5ef57a07ff0f43909305 (patch) | |
| tree | 827aaf4dbb628eb31517aaf2960814a521430229 /spec/models/ci/pipeline_spec.rb | |
| parent | 1e0df21a74017deb780023ed83f04dbbeed13899 (diff) | |
| parent | 180ec7113e358a7f8388e1436dc0670a11ba68df (diff) | |
| download | gitlab-ce-docs/hide-gcp-install.tar.gz | |
Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-install
# Conflicts:
# doc/install/README.md
Diffstat (limited to 'spec/models/ci/pipeline_spec.rb')
| -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..06e990a0574 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 |