Makes the wiki sidebar editable (#5208).

The content of the wiki page named 'Sidebar' is rendered in the sidebar if it exists. Permission to edit protected pages is required to create this page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3632 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/wiki_controller_test.rb

@@ -70,6 +70,17 @@ class WikiControllerTest < ActionController::TestCase
                                                :alt => 'This is a logo' }
   end
   
+  def test_show_with_sidebar
+    page = Project.find(1).wiki.pages.new(:title => 'Sidebar')
+    page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
+    page.save!
+    
+    get :index, :id => 1, :page => 'Another_page'
+    assert_response :success
+    assert_tag :tag => 'div', :attributes => {:id => 'sidebar'},
+                              :content => /Side bar content for test_show_with_sidebar/
+  end
+  
   def test_show_unexistent_page_without_edit_right
     get :index, :id => 1, :page => 'Unexistent page'
     assert_response 404

test/unit/wiki_page_test.rb

@@ -33,11 +33,18 @@ class WikiPageTest < ActiveSupport::TestCase
     page.title = "Page"
     assert page.save
     page.reload
+    assert !page.protected?
     
     @wiki.reload
     assert @wiki.pages.include?(page)
   end
   
+  def test_sidebar_should_be_protected_by_default
+    page = @wiki.find_or_new_page('sidebar')
+    assert page.new_record?
+    assert page.protected?
+  end
+  
   def test_find_or_new_page
     page = @wiki.find_or_new_page("CookBook documentation")
     assert_kind_of WikiPage, page

test/unit/wiki_test.rb

@@ -43,4 +43,23 @@ class WikiTest < ActiveSupport::TestCase
     assert_equal 'Page_title_with_CAPITALES', Wiki.titleize('page title with CAPITALES')
     assert_equal 'テスト', Wiki.titleize('テスト')
   end
+  
+  context "#sidebar" do
+    setup do
+      @wiki = Wiki.find(1)
+    end
+    
+    should "return nil if undefined" do
+      assert_nil @wiki.sidebar
+    end
+    
+    should "return a WikiPage if defined" do
+      page = @wiki.pages.new(:title => 'Sidebar')
+      page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
+      page.save!
+      
+      assert_kind_of WikiPage, @wiki.sidebar
+      assert_equal 'Sidebar', @wiki.sidebar.title
+    end
+  end
 end