summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-08 12:59:11 +0000
committerStan Hu <stanhu@gmail.com>2016-10-08 12:59:11 +0000
commited2fe98412e072214c4579eb9bfdae0e5e440f72 (patch)
treed19dbf207ece27d461ed9be5f793883948311d07
parent28ca8502c254d5c3edfb7ece36fc365e7a715df0 (diff)
parent4695bb8829679a75f66178b2ebf16059d90f6f33 (diff)
downloadgitlab-ce-ed2fe98412e072214c4579eb9bfdae0e5e440f72.tar.gz
Merge branch 'sh-fix-for-ruby-2.1.0-spec' into 'master'
Use Hash rocket syntax to maintain Ruby 2.1 compatibility in spec Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/4883142 See merge request !6756
-rw-r--r--spec/lib/banzai/object_renderer_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/banzai/object_renderer_spec.rb b/spec/lib/banzai/object_renderer_spec.rb
index f5ff236105e..90da78a67dd 100644
--- a/spec/lib/banzai/object_renderer_spec.rb
+++ b/spec/lib/banzai/object_renderer_spec.rb
@@ -5,7 +5,7 @@ describe Banzai::ObjectRenderer do
let(:user) { project.owner }
def fake_object(attrs = {})
- object = double(attrs.merge("new_record?": true, "destroyed?": true))
+ object = double(attrs.merge("new_record?" => true, "destroyed?" => true))
allow(object).to receive(:markdown_cache_field_for).with(:note).and_return(:note_html)
allow(object).to receive(:banzai_render_context).with(:note).and_return(project: nil, author: nil)
allow(object).to receive(:update_column).with(:note_html, anything).and_return(true)