diff test/functional/issue_categories_controller_test.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/test/functional/issue_categories_controller_test.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/test/functional/issue_categories_controller_test.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -1,16 +1,16 @@
 # Redmine - project management software
-# Copyright (C) 2006-2009  Jean-Philippe Lang
+# Copyright (C) 2006-2011  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.
@@ -23,7 +23,7 @@
 
 class IssueCategoriesControllerTest < ActionController::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories
-  
+
   def setup
     @controller = IssueCategoriesController.new
     @request    = ActionController::TestRequest.new
@@ -31,63 +31,83 @@
     User.current = nil
     @request.session[:user_id] = 2
   end
-  
-  def test_get_new
+
+  def test_new
     @request.session[:user_id] = 2 # manager
     get :new, :project_id => '1'
     assert_response :success
     assert_template 'new'
   end
-  
-  def test_post_new
+
+  def test_create
     @request.session[:user_id] = 2 # manager
     assert_difference 'IssueCategory.count' do
-      post :new, :project_id => '1', :category => {:name => 'New category'}
+      post :create, :project_id => '1', :issue_category => {:name => 'New category'}
     end
     assert_redirected_to '/projects/ecookbook/settings/categories'
     category = IssueCategory.find_by_name('New category')
     assert_not_nil category
     assert_equal 1, category.project_id
   end
-  
-  def test_post_edit
+
+  def test_create_failure
+    @request.session[:user_id] = 2
+    post :create, :project_id => '1', :issue_category => {:name => ''}
+    assert_response :success
+    assert_template 'new'
+  end
+
+  def test_edit
+    @request.session[:user_id] = 2
+    get :edit, :id => 2
+    assert_response :success
+    assert_template 'edit'
+  end
+
+  def test_update
     assert_no_difference 'IssueCategory.count' do
-      post :edit, :id => 2, :category => { :name => 'Testing' }
+      put :update, :id => 2, :issue_category => { :name => 'Testing' }
     end
     assert_redirected_to '/projects/ecookbook/settings/categories'
     assert_equal 'Testing', IssueCategory.find(2).name
   end
-  
-  def test_edit_not_found
-    post :edit, :id => 97, :category => { :name => 'Testing' }
+
+  def test_update_failure
+    put :update, :id => 2, :issue_category => { :name => '' }
+    assert_response :success
+    assert_template 'edit'
+  end
+
+  def test_update_not_found
+    put :update, :id => 97, :issue_category => { :name => 'Testing' }
     assert_response 404
   end
-  
+
   def test_destroy_category_not_in_use
-    post :destroy, :id => 2
+    delete :destroy, :id => 2
     assert_redirected_to '/projects/ecookbook/settings/categories'
     assert_nil IssueCategory.find_by_id(2)
   end
-  
+
   def test_destroy_category_in_use
-    post :destroy, :id => 1
+    delete :destroy, :id => 1
     assert_response :success
     assert_template 'destroy'
     assert_not_nil IssueCategory.find_by_id(1)
   end
-  
+
   def test_destroy_category_in_use_with_reassignment
     issue = Issue.find(:first, :conditions => {:category_id => 1})
-    post :destroy, :id => 1, :todo => 'reassign', :reassign_to_id => 2
+    delete :destroy, :id => 1, :todo => 'reassign', :reassign_to_id => 2
     assert_redirected_to '/projects/ecookbook/settings/categories'
     assert_nil IssueCategory.find_by_id(1)
     # check that the issue was reassign
     assert_equal 2, issue.reload.category_id
   end
-  
+
   def test_destroy_category_in_use_without_reassignment
     issue = Issue.find(:first, :conditions => {:category_id => 1})
-    post :destroy, :id => 1, :todo => 'nullify'
+    delete :destroy, :id => 1, :todo => 'nullify'
     assert_redirected_to '/projects/ecookbook/settings/categories'
     assert_nil IssueCategory.find_by_id(1)
     # check that the issue category was nullified