Refactor: move IssuesController#reply to JournalsController

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

3 files changed, 15 insertions, 15 deletions

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 6b23a6511..0c1172f60 100644
--- a/test/functional/issues_controller_test.rb
+++ b/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'
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index 0a11bab3e..7d8345b28 100644
--- a/test/functional/journals_controller_test.rb
+++ b/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
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index af66f7417..b9eac552e 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -88,7 +88,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/issues/move/new", :controller => 'issue_moves', :action => 'new'
     should_route :post, "/issues/move", :controller => 'issue_moves', :action => 'create'
     
-    should_route :post, "/issues/1/quoted", :controller => 'issues', :action => 'reply', :id => '1'
+    should_route :post, "/issues/1/quoted", :controller => 'journals', :action => 'new', :id => '1'
 
     should_route :get, "/issues/calendar", :controller => 'calendars', :action => 'show'
     should_route :post, "/issues/calendar", :controller => 'calendars', :action => 'show'

path: root/test