Fixed: Unable to create a wiki (Rails 2.0 compatibility).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@998 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 146aaac8a1d94a9f455cebcede298ffea432a6fb..a222570ef19798b9d8df6c14315abd9aa2aa426c 100644 (file)
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -23,7 +23,7 @@ class WikisController < ApplicationController
   def edit
     @wiki = @project.wiki || Wiki.new(:project => @project)
     @wiki.attributes = params[:wiki]
-    @wiki.save if @request.post?
+    @wiki.save if request.post?
     render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
   end
 

diff --git a/test/fixtures/enabled_modules.yml b/test/fixtures/enabled_modules.yml
index dfc2f009066e775a45229b9d6ff771e29a436d88..8d1565534d0e6f832232f5d886024fa77cef1fa9 100644 (file)
--- a/test/fixtures/enabled_modules.yml
+++ b/test/fixtures/enabled_modules.yml
@@ -35,4 +35,8 @@ enabled_modules_009:
   name: repository
   project_id: 3
   id: 9
+enabled_modules_010: 
+  name: wiki
+  project_id: 3
+  id: 10
   
\ No newline at end of file

diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
new file mode 100644 (file)
index 0000000..a343fda
--- /dev/null
+++ b/test/functional/wikis_controller_test.rb
@@ -0,0 +1,43 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'wikis_controller'
+
+# Re-raise errors caught by the controller.
+class WikisController; def rescue_action(e) raise e end; end
+
+class WikisControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis
+  
+  def setup
+    @controller = WikisController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_create_wiki
+    @request.session[:user_id] = 1
+    assert_nil Project.find(3).wiki
+    post :edit, :id => 3, :wiki => { :start_page => 'Start page' }
+    assert_response :success
+    wiki = Project.find(3).wiki
+    assert_not_nil wiki
+    assert_equal 'Start page', wiki.start_page
+  end
+end