From: Riyad Preukschas Date: Mon, 6 Aug 2012 00:32:17 +0000 (+0200) Subject: Fix GFM helper to raise an exception when @project is not set X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f9428b1cd66d9f4ded1f1b1ef38e258e2b97c50;p=wvm%2Fgitlab.git Fix GFM helper to raise an exception when @project is not set --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5e7cddb3b..06cfa5b67 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -44,6 +44,7 @@ module ApplicationHelper def gfm(text, html_options = {}) return text if text.nil? + raise "@project is not set" if @project.nil? # Extract pre blocks # from http://github.github.com/github-flavored-markdown/ diff --git a/spec/helpers/gitlab_flavored_markdown_spec.rb b/spec/helpers/gitlab_flavored_markdown_spec.rb index c1d95b820..9ba2e9113 100644 --- a/spec/helpers/gitlab_flavored_markdown_spec.rb +++ b/spec/helpers/gitlab_flavored_markdown_spec.rb @@ -10,6 +10,12 @@ describe ApplicationHelper do end describe "#gfm" do + it "should raiase an error if @project is not set" do + @project = nil + + expect { gfm("foo") }.to raise_error + end + describe "referencing a commit" do it "should link using a full id" do gfm("Reverts changes from #{@commit.id}").should == "Reverts changes from #{link_to @commit.id, project_commit_path(@project, :id => @commit.id), :title => "Commit: #{@commit.author_name} - #{@commit.title}", :class => "gfm gfm-commit "}"