Skip to content
Snippets Groups Projects
Commit 04bad825 authored by randx's avatar randx
Browse files

Fixed markdown tests

parent 6171a4d8
No related branches found
No related tags found
No related merge requests found
Loading
@@ -42,21 +42,6 @@ module ApplicationHelper
Loading
@@ -42,21 +42,6 @@ module ApplicationHelper
grouped_options_for_select(options, @ref || @project.default_branch) grouped_options_for_select(options, @ref || @project.default_branch)
end 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 def search_autocomplete_source
projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } } projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } }
default_nav = [ default_nav = [
Loading
Loading
Loading
@@ -78,4 +78,19 @@ module GitlabMarkdownHelper
Loading
@@ -78,4 +78,19 @@ module GitlabMarkdownHelper
   
link_to(gfm_body.html_safe, url, html_options) link_to(gfm_body.html_safe, url, html_options)
end 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 end
require "spec_helper" require "spec_helper"
   
describe ApplicationHelper do describe GitlabMarkdownHelper do
before do before do
@project = Project.find_by_path("gitlabhq") || Factory(:project) @project = Project.find_by_path("gitlabhq") || Factory(:project)
@commit = @project.repo.commits.first.parents.first @commit = @project.repo.commits.first.parents.first
Loading
@@ -10,10 +10,10 @@ describe ApplicationHelper do
Loading
@@ -10,10 +10,10 @@ describe ApplicationHelper do
end end
   
describe "#gfm" do 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 @project = nil
   
expect { gfm("foo") }.to raise_error gfm("foo").should == "foo"
end end
   
describe "referencing a commit" do describe "referencing a commit" do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment