Merged r3941 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3991 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/issues_controller_test.rb

@@ -634,20 +634,6 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 'This is the test_new issue', issue.subject
   end
   
-  def test_reply_to_issue
-    @request.session[:user_id] = 2
-    get :reply, :id => 1
-    assert_response :success
-    assert_select_rjs :show, "update"
-  end
-
-  def test_reply_to_note
-    @request.session[:user_id] = 2
-    get :reply, :id => 1, :journal_id => 2
-    assert_response :success
-    assert_select_rjs :show, "update"
-  end
-
   def test_update_using_invalid_http_verbs
     @request.session[:user_id] = 2
     subject = 'Updated by an invalid http verb'

test/functional/journals_controller_test.rb

@@ -31,6 +31,20 @@ class JournalsControllerTest < ActionController::TestCase
     User.current = nil
   end
   
+  def test_reply_to_issue
+    @request.session[:user_id] = 2
+    get :new, :id => 1
+    assert_response :success
+    assert_select_rjs :show, "update"
+  end
+
+  def test_reply_to_note
+    @request.session[:user_id] = 2
+    get :new, :id => 1, :journal_id => 2
+    assert_response :success
+    assert_select_rjs :show, "update"
+  end
+
   def test_get_edit
     @request.session[:user_id] = 1
     xhr :get, :edit, :id => 2