summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaverio Miroddi <saverio.pub2@gmail.com>2017-08-22 22:20:22 +0200
committerSaverio Miroddi <saverio.pub2@gmail.com>2017-08-22 22:20:22 +0200
commit934eef72902d6e753f47f7f8dbc42959c399ad09 (patch)
treecdafbed950d6f59dece3662fd4c5e2e1e675e7c7
parente07c0c0e2376040da65ce636b94be0884c465780 (diff)
downloadgitlab-ce-934eef72902d6e753f47f7f8dbc42959c399ad09.tar.gz
Improve description of a Commit#cherry_pick_message UT
-rw-r--r--spec/models/commit_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 6fbd58f1d84..11e64a0f877 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -248,8 +248,8 @@ eos
end
end
- context "that is existing but not found (eg. it's in progress)" do
- it do
+ context "that is existing but not found" do
+ it 'does not include details of the merged commits' do
expect(merge_commit.cherry_pick_message(user)).to end_with("(cherry picked from commit #{merge_commit.sha})")
end
end