summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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