Improve #470 fix.
This commit is contained in:
@@ -6,8 +6,7 @@ module Precious
|
|||||||
attr_reader :results, :ref
|
attr_reader :results, :ref
|
||||||
|
|
||||||
def prefix
|
def prefix
|
||||||
return '/' if @base_url.nil?
|
@base_url ? @base_url.chomp('/') + '/' : '/'
|
||||||
@base_url.chomp('/').empty? ? '/' : @base_url + '/'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def title
|
def title
|
||||||
|
|||||||
@@ -34,4 +34,13 @@ context "Precious::Views::Pages" do
|
|||||||
@page.instance_variable_set("@results", results)
|
@page.instance_variable_set("@results", results)
|
||||||
assert_equal %{<li><a href="/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders
|
assert_equal %{<li><a href="/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "base url" do
|
||||||
|
# based on test "files_folders"
|
||||||
|
@page.instance_variable_set("@path", "Mordor")
|
||||||
|
@page.instance_variable_set("@base_url", "/wiki")
|
||||||
|
results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
|
||||||
|
@page.instance_variable_set("@results", results)
|
||||||
|
assert_equal %{<li><a href="/wiki/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/wiki/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user