diff options
author | Stefan Tatschner <stefan@sevenbyte.org> | 2015-01-15 12:19:34 +0100 |
---|---|---|
committer | Stefan Tatschner <stefan@sevenbyte.org> | 2015-01-15 14:01:12 +0100 |
commit | 089516209c0c9c618b359aaa59e26395e2f67405 (patch) | |
tree | 06711c06c02b6dd7d279ce5416c19045cf88ad5c /spec | |
parent | bf079c24afb8ad2991a4eaf60a71a7bc45dd775d (diff) | |
download | gitlab-ce-089516209c0c9c618b359aaa59e26395e2f67405.tar.gz |
Fixed tests
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/events_helper_spec.rb | 3 | ||||
-rw-r--r-- | spec/helpers/gitlab_markdown_helper_spec.rb | 2 | ||||
-rw-r--r-- | 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 4de54d291f2..c4a192ac1aa 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 = '<pre><code class="">Code block...</code></pre>' + expected = '<pre class="code highlight white plaintext"><code>' \ + 'Code block...</code></pre>' 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 3c636b747d1..86ba801ce07 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<div class=\"highlighted-data white\">\n <div class=\"highlight\">\n <pre><code class=\"\">some code from $#{snippet.id}\nhere too\n</code></pre>\n </div>\n</div>\n\n" + target_html = "<pre class=\"code highlight white plaintext\"><code>some code from $40\nhere too\n</code></pre>\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 d065431ee3a..78877db61b7 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 |