Merge pull request #895 from repotag/rc_fix_sidebar

Fix sidebar, header, and footer, and add regression test.

lib/gollum/views/page.rb

@@ -57,7 +57,7 @@ module Precious
 
       def has_header
         if @header
-          return false if @header.formatted_data.strip.empty?
+          @header.formatted_data.strip.empty? ? false : true
         else
           @header = (@page.header || false)
           !!@header
@@ -74,7 +74,7 @@ module Precious
 
       def has_footer
         if @footer
-          return false if @footer.formatted_data.strip.empty?
+          @footer.formatted_data.strip.empty? ? false : true
         else
           @footer = (@page.footer || false)
           !!@footer
@@ -95,7 +95,7 @@ module Precious
 
       def has_sidebar
         if @sidebar
-          return false if @sidebar.formatted_data.strip.empty?
+          @sidebar.formatted_data.strip.empty? ? false : true
         else
           @sidebar = (@page.sidebar || false)
           !!@sidebar

test/test_app.rb

@@ -84,6 +84,13 @@ context "Frontend" do
     assert_match /#{expected}/, actual
   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
     page1 = 'page1'
     user1 = 'user1'