diff options
author | Felipe Artur <felipefac@gmail.com> | 2017-03-28 17:04:14 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-05-08 11:29:10 -0300 |
commit | d9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d (patch) | |
tree | 94a54961d28098ea0675f2cb15ea19bbe27166e6 /spec/models | |
parent | 1bf2dacf2002fabf3b7bd364031d9020e5d0b624 (diff) | |
download | gitlab-ce-d9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d.tar.gz |
Fix specs 2
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 86ed37b50aa..06e990a0574 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1045,7 +1045,7 @@ describe Ci::Pipeline, models: true do it "returns merge requests whose `diff_head_sha` matches the pipeline's SHA" do 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) + merge_request = create(:merge_request, source_project: project, head_pipeline: pipeline, source_branch: pipeline.ref) expect(pipeline.merge_requests).to eq([merge_request]) end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 45a5cd049a2..1db1640f5e5 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1507,6 +1507,8 @@ describe MergeRequest, models: true do status: status) merge_request.update(head_pipeline: pipeline) + + pipeline end let(:project) { create(:project, :public, :repository, only_allow_merge_if_pipeline_succeeds: true) } @@ -1592,7 +1594,7 @@ describe MergeRequest, models: true do context 'with running pipeline' do before do - merge_request.update(head_pipeline: create_pipeline(:running)) + create_pipeline(:running) end it 'is mergeable' do |