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

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

--- a/test/functional/issue_relations_controller_test.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/test/functional/issue_relations_controller_test.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -1,3 +1,20 @@
+# Redmine - project management software
+# 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.
+
 require File.expand_path('../../test_helper', __FILE__)
 require 'issue_relations_controller'
 
@@ -17,27 +34,27 @@
            :enabled_modules,
            :enumerations,
            :trackers
-  
+
   def setup
     @controller = IssueRelationsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     User.current = nil
   end
-  
-  def test_new
+
+  def test_create
     assert_difference 'IssueRelation.count' do
       @request.session[:user_id] = 3
-      post :new, :issue_id => 1, 
+      post :create, :issue_id => 1,
                  :relation => {:issue_to_id => '2', :relation_type => 'relates', :delay => ''}
     end
   end
-  
-  def test_new_xhr
+
+  def test_create_xhr
     assert_difference 'IssueRelation.count' do
       @request.session[:user_id] = 3
-      xhr :post, :new,
-        :issue_id => 3, 
+      xhr :post, :create,
+        :issue_id => 3,
         :relation => {:issue_to_id => '1', :relation_type => 'relates', :delay => ''}
       assert_select_rjs 'relations' do
         assert_select 'table', 1
@@ -45,58 +62,55 @@
       end
     end
   end
-  
-  def test_new_should_accept_id_with_hash
+
+  def test_create_should_accept_id_with_hash
     assert_difference 'IssueRelation.count' do
       @request.session[:user_id] = 3
-      post :new, :issue_id => 1, 
+      post :create, :issue_id => 1,
                  :relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
     end
   end
-  
-  def test_new_should_not_break_with_non_numerical_id
+
+  def test_create_should_not_break_with_non_numerical_id
     assert_no_difference 'IssueRelation.count' do
       assert_nothing_raised do
         @request.session[:user_id] = 3
-        post :new, :issue_id => 1, 
+        post :create, :issue_id => 1,
                    :relation => {:issue_to_id => 'foo', :relation_type => 'relates', :delay => ''}
       end
     end
   end
-  
+
   def test_should_create_relations_with_visible_issues_only
     Setting.cross_project_issue_relations = '1'
     assert_nil Issue.visible(User.find(3)).find_by_id(4)
-    
+
     assert_no_difference 'IssueRelation.count' do
       @request.session[:user_id] = 3
-      post :new, :issue_id => 1, 
+      post :create, :issue_id => 1,
                  :relation => {:issue_to_id => '4', :relation_type => 'relates', :delay => ''}
     end
   end
 
   should "prevent relation creation when there's a circular dependency"
-  
+
   def test_destroy
     assert_difference 'IssueRelation.count', -1 do
       @request.session[:user_id] = 3
-      post :destroy, :id => '2', :issue_id => '3'
+      delete :destroy, :id => '2'
     end
   end
-  
+
   def test_destroy_xhr
     IssueRelation.create!(:relation_type => IssueRelation::TYPE_RELATES) do |r|
       r.issue_from_id = 3
       r.issue_to_id = 1
     end
-    
+
     assert_difference 'IssueRelation.count', -1 do
       @request.session[:user_id] = 3
-      xhr :post, :destroy, :id => '2', :issue_id => '3'
-      assert_select_rjs 'relations' do
-        assert_select 'table', 1
-        assert_select 'tr', 1 # relation left
-      end
+      xhr :delete, :destroy, :id => '2'
+      assert_select_rjs  :remove, 'relation-2'
     end
   end
 end