Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Gizotti <gabriel@gizotti.com>2016-12-13 16:00:00 +0300
committerGabriel Gizotti <gabriel@gizotti.com>2016-12-16 12:15:07 +0300
commit3e3d6b53dcdc50bbe45c4b3ff43faf3d2728f72c (patch)
tree2779e96846290041ee69ce91edc1bd2c9ef32d82 /spec/models/merge_request_spec.rb
parentf3378630c15d43080d2bda03f5165653092a660b (diff)
Change closes issues reference text on MergeRequest#merge_commit_message to match existing text generated by the system
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 1e9790cf644..5da00a8636a 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -416,16 +416,16 @@ describe MergeRequest, models: true do
end
it 'includes its closed issues in the body' do
- issue = create(:issue, project: subject.project)
+ issue = create(:issue, project: subject.project)
subject.project.team << [subject.author, :developer]
- subject.description = "Closes #{issue.to_reference}"
+ subject.description = "This issue Closes #{issue.to_reference}"
allow(subject.project).to receive(:default_branch).
and_return(subject.target_branch)
expect(subject.merge_commit_message)
- .to match("Closes issue #{issue.to_reference}")
+ .to match("Closes #{issue.to_reference}")
end
it 'includes its reference in the body' do