diff options
| author | Toon Claes <toon@gitlab.com> | 2017-04-24 12:20:46 +0200 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2017-04-27 13:22:17 +0200 |
| commit | a53442751f77cd586a511c5a539341377ec22807 (patch) | |
| tree | 8ec5d15a4324884c8ddf0c500f1728c7cadd3940 | |
| parent | 677101b916a6a1b0a0f38a3e78c2c7c1ea8f9a74 (diff) | |
| download | gitlab-ce-a53442751f77cd586a511c5a539341377ec22807.tar.gz | |
Fix failing specs
| -rw-r--r-- | spec/helpers/markup_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/other_markup_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb index bba4f4fdc8e..914b944eb58 100644 --- a/spec/helpers/markup_helper_spec.rb +++ b/spec/helpers/markup_helper_spec.rb @@ -126,7 +126,7 @@ describe MarkupHelper do it "uses Wiki pipeline for markdown files" do allow(@wiki).to receive(:format).and_return(:markdown) - expect(helper).to receive(:markdown_unsafe).with('wiki content', pipeline: :wiki, project_wiki: @wiki, page_slug: "nested/page") + expect(helper).to receive(:markdown_unsafe).with('wiki content', pipeline: :wiki, project: project, project_wiki: @wiki, page_slug: "nested/page") helper.render_wiki_content(@wiki) end diff --git a/spec/lib/gitlab/other_markup_spec.rb b/spec/lib/gitlab/other_markup_spec.rb index 22e80ec46be..d6d53e8586c 100644 --- a/spec/lib/gitlab/other_markup_spec.rb +++ b/spec/lib/gitlab/other_markup_spec.rb @@ -13,7 +13,7 @@ describe Gitlab::OtherMarkup, lib: true do } links.each do |name, data| it "does not convert dangerous #{name} into HTML" do - expect(render(data[:file], data[:input], context)).to eql data[:output] + expect(render(data[:file], data[:input])).to eq(data[:output]) end end end |