summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-10-25 10:57:51 +0000
committerDouwe Maan <douwe@gitlab.com>2016-10-25 10:57:51 +0000
commitba27abec815e476481b976175c67273c1cbb6e57 (patch)
treeae3cb12e2147a48fbebabd383b03c06078f28467 /spec/models
parentdd3b451d78e3db1e2b79229677d5af95b025bbc7 (diff)
parented545d9f754374c7a5fe98a81544f0d1cdc88cf0 (diff)
downloadgitlab-ce-ba27abec815e476481b976175c67273c1cbb6e57.tar.gz
Merge branch 'show-commit-status-from-source-project' into 'master'
Show commits from source project. Be consistent with pipeline ## What does this MR do? Show commits from source project instead of target project. ## Why was this MR needed? To be consistent. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #3596 See merge request !6658
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/merge_request_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 3155eff9ee1..1067ff7bb4d 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1286,7 +1286,8 @@ describe MergeRequest, models: true do
let(:project) { create(:project) }
let(:user) { create(:user) }
let(:fork_project) { create(:project, forked_from_project: project, namespace: user.namespace) }
- let(:merge_request) do
+
+ let!(:merge_request) do
create(:closed_merge_request,
source_project: fork_project,
target_project: project)