wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #651 from simonista/fix-specs

Browse Source 
Fix tests that depended on old github location
This commit is contained in:
Jamie Oliver
2013-03-15 01:52:46 -07:00
parent 544d499ab1 02dfb0a8c1
commit 5dcd3c8c8f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/markup.rb
+1 -1
View File
@@ -470,7 +470,7 @@ module Gollum
# Use empty string if $2 is nil. # Use empty string if $2 is nil.
uri = $2 || '' uri = $2 || ''
# Detect local file. # Detect local file.
if uri[0..6] != 'github/' if uri[0..6] != 'gollum/'
if file = self.find_file(uri, @wiki.ref) if file = self.find_file(uri, @wiki.ref)
contents = file.raw_data contents = file.raw_data
else else
test/test_gitcode.rb
+2 -2
View File
@@ -18,7 +18,7 @@ context "gitcode" do
@wiki, @path, @cleanup = WikiFactory.create 'examples/test.git' @wiki, @path, @cleanup = WikiFactory.create 'examples/test.git'
# given # given
p = page_with_content "a\n\n```html:github/gollum/master/test/file_view/1_file.txt```\n\nb" p = page_with_content "a\n\n```html:gollum/gollum/master/test/file_view/1_file.txt```\n\nb"
# when rendering the page # when rendering the page
@rendered = Gollum::Markup.new(p).render @rendered = Gollum::Markup.new(p).render
@@ -29,7 +29,7 @@ context "gitcode" do
end end
test 'contents' do test 'contents' do
g = Gollum::Gitcode.new 'github/gollum/master/test/file_view/1_file.txt' g = Gollum::Gitcode.new 'gollum/gollum/master/test/file_view/1_file.txt'
assert_equal g.contents, %{<ol class=\"tree\">\n <li class=\"file\">\n <a href=\"0\"><span class=\"icon\"></span>0</a>\n </li>\n</ol>\n} assert_equal g.contents, %{<ol class=\"tree\">\n <li class=\"file\">\n <a href=\"0\"><span class=\"icon\"></span>0</a>\n </li>\n</ol>\n}
end end