Fixed markdown tests

3 files changed, 18 insertions, 18 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 87536e00886..e1aa14c9f6d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -42,21 +42,6 @@ module ApplicationHelper
     grouped_options_for_select(options, @ref || @project.default_branch)
   end
 
-  def markdown(text)
-    @__renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true, with_toc_data: true), {
-      no_intra_emphasis: true,
-      tables: true,
-      fenced_code_blocks: true,
-      autolink: true,
-      strikethrough: true,
-      lax_html_blocks: true,
-      space_after_headers: true,
-      superscript: true
-    })
-
-    @__renderer.render(text).html_safe
-  end
-
   def search_autocomplete_source
     projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } }
     default_nav = [
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index df8a1b6c2a0..f839ee5523b 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -78,4 +78,19 @@ module GitlabMarkdownHelper
 
     link_to(gfm_body.html_safe, url, html_options)
   end
+
+  def markdown(text)
+    @__renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true, with_toc_data: true), {
+      no_intra_emphasis: true,
+      tables: true,
+      fenced_code_blocks: true,
+      autolink: true,
+      strikethrough: true,
+      lax_html_blocks: true,
+      space_after_headers: true,
+      superscript: true
+    })
+
+    @__renderer.render(text).html_safe
+  end
 end
diff --git a/spec/helpers/gitlab_flavored_markdown_spec.rb b/spec/helpers/gitlab_flavored_markdown_spec.rb
index 9ba2e911359..15fd21804eb 100644
--- a/spec/helpers/gitlab_flavored_markdown_spec.rb
+++ b/spec/helpers/gitlab_flavored_markdown_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe ApplicationHelper do
+describe GitlabMarkdownHelper do
   before do
     @project = Project.find_by_path("gitlabhq") || Factory(:project)
     @commit = @project.repo.commits.first.parents.first
@@ -10,10 +10,10 @@ describe ApplicationHelper do
   end
 
   describe "#gfm" do
-    it "should raiase an error if @project is not set" do
+    it "should return text if @project is not set" do
       @project = nil
 
-      expect { gfm("foo") }.to raise_error
+      gfm("foo").should == "foo"
     end
 
     describe "referencing a commit" do