From 089516209c0c9c618b359aaa59e26395e2f67405 Mon Sep 17 00:00:00 2001 From: Stefan Tatschner Date: Thu, 15 Jan 2015 12:19:34 +0100 Subject: [PATCH] Fixed tests --- spec/helpers/events_helper_spec.rb | 3 ++- spec/helpers/gitlab_markdown_helper_spec.rb | 2 +- spec/models/wiki_page_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb index 4de54d291f..c4a192ac1a 100644 --- a/spec/helpers/events_helper_spec.rb +++ b/spec/helpers/events_helper_spec.rb @@ -26,7 +26,8 @@ describe EventsHelper do it 'should display the first line of a code block' do input = "```\nCode block\nwith two lines\n```" - expected = '
Code block...
' + expected = '
' \
+               'Code block...
' expect(event_note(input)).to match(expected) end diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index 3c636b747d..86ba801ce0 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -566,7 +566,7 @@ describe GitlabMarkdownHelper do it "should leave code blocks untouched" do helper.stub(:user_color_scheme_class).and_return(:white) - target_html = "\n
\n
\n
some code from $#{snippet.id}\nhere too\n
\n
\n
\n\n" + target_html = "
some code from $40\nhere too\n
\n" helper.markdown("\n some code from $#{snippet.id}\n here too\n").should == target_html helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should == target_html diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index d065431ee3..78877db61b 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -36,7 +36,7 @@ describe WikiPage do end it "sets the version attribute" do - @wiki_page.version.should be_a Grit::Commit + @wiki_page.version.should be_a Gollum::Git::Commit end end end