summaryrefslogtreecommitdiff
path: root/spec/models/commit_spec.rb
diff options
context:
space:
mode:
authorSaverio Miroddi <saverio.pub2@gmail.com>2017-08-21 20:47:18 +0200
committerSaverio Miroddi <saverio.pub2@gmail.com>2017-08-21 20:47:18 +0200
commit9ec358af7bfe95c90d1c3c3fdd1db8a3a69c11ed (patch)
tree3863d3b42e4b847b7e75611a56925c6b921b325c /spec/models/commit_spec.rb
parentb4622c772ed1fb6974b0e5f39890978d48ad77da (diff)
downloadgitlab-ce-9ec358af7bfe95c90d1c3c3fdd1db8a3a69c11ed.tar.gz
Reverse order of commits in MR cherry-pick message
Also improved the UT for better documenting this change.
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r--spec/models/commit_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 8fc2a30e3ad..25de444da11 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -214,7 +214,7 @@ eos
let(:merge_commit) do
merge_request = create(:merge_request,
- source_branch: 'feature',
+ source_branch: 'video',
target_branch: 'master',
source_project: project,
author: user)
@@ -238,7 +238,8 @@ eos
(cherry picked from commit #{merge_commit.sha})
- 0b4bc9a4 Feature added
+ 467dc98f Add new 'videos' directory
+ 88790590 Upload new video file
STR
expect(merge_commit.cherry_pick_message(user)).to include(expected_appended_text)