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

Merge pull request #895 from repotag/rc_fix_sidebar

Browse Source 
Fix sidebar, header, and footer, and add regression test.
This commit is contained in:
Dawa Ometto
2014-11-10 22:54:05 +01:00
parent 7264510ab2 c78a9f7950
commit 226c253d5a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/views/page.rb
+3 -3
View File
@@ -57,7 +57,7 @@ module Precious
def has_header def has_header
if @header if @header
return false if @header.formatted_data.strip.empty? @header.formatted_data.strip.empty? ? false : true
else else
@header = (@page.header || false) @header = (@page.header || false)
!!@header !!@header
@@ -74,7 +74,7 @@ module Precious
def has_footer def has_footer
if @footer if @footer
return false if @footer.formatted_data.strip.empty? @footer.formatted_data.strip.empty? ? false : true
else else
@footer = (@page.footer || false) @footer = (@page.footer || false)
!!@footer !!@footer
@@ -95,7 +95,7 @@ module Precious
def has_sidebar def has_sidebar
if @sidebar if @sidebar
return false if @sidebar.formatted_data.strip.empty? @sidebar.formatted_data.strip.empty? ? false : true
else else
@sidebar = (@page.sidebar || false) @sidebar = (@page.sidebar || false)
!!@sidebar !!@sidebar
test/test_app.rb
+7
View File
@@ -84,6 +84,13 @@ context "Frontend" do
assert_match /#{expected}/, actual assert_match /#{expected}/, actual
end end
test "show sidebar, header, footer when present" do
divs = [@wiki.page("_Header").formatted_data, @wiki.page("_Footer").formatted_data, @wiki.page("_Sidebar").formatted_data]
@wiki.write_page("HeaderTest", :markdown, "Test", commit_details)
get "/HeaderTest"
divs.each {|div| assert_match div, last_response.body}
end
test "retain edit information" do test "retain edit information" do
page1 = 'page1' page1 = 'page1'
user1 = 'user1' user1 = 'user1'