3 files changed, 48 insertions, 21 deletions
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
new file mode 100644
index 000000000..1a9d628d8
--- /dev/null
+++ b/test/functional/comments_controller_test.rb
@@ -0,0 +1,46 @@
+# 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'
+
+class CommentsControllerTest < ActionController::TestCase
+  fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments
+  
+  def setup
+    User.current = nil
+  end
+  
+  def test_add_comment
+    @request.session[:user_id] = 2
+    post :create, :id => 1, :comment => { :comments => 'This is a test comment' }
+    assert_redirected_to 'news/1'
+    
+    comment = News.find(1).comments.find(:first, :order => 'created_on DESC')
+    assert_not_nil comment
+    assert_equal 'This is a test comment', comment.comments
+    assert_equal User.find(2), comment.author
+  end
+  
+  def test_empty_comment_should_not_be_added
+    @request.session[:user_id] = 2
+    assert_no_difference 'Comment.count' do
+      post :create, :id => 1, :comment => { :comments => '' }
+      assert_response :redirect
+      assert_redirected_to 'news/1'
+    end
+  end
+end
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 5f00fd914..ddc8b0c2c 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -111,26 +111,6 @@ class NewsControllerTest < ActionController::TestCase
                               :content => /1 error/
   end
   
-  def test_add_comment
-    @request.session[:user_id] = 2
-    post :add_comment, :id => 1, :comment => { :comments => 'This is a NewsControllerTest comment' }
-    assert_redirected_to 'news/1'
-    
-    comment = News.find(1).comments.find(:first, :order => 'created_on DESC')
-    assert_not_nil comment
-    assert_equal 'This is a NewsControllerTest comment', comment.comments
-    assert_equal User.find(2), comment.author
-  end
-  
-  def test_empty_comment_should_not_be_added
-    @request.session[:user_id] = 2
-    assert_no_difference 'Comment.count' do
-      post :add_comment, :id => 1, :comment => { :comments => '' }
-      assert_response :success
-      assert_template 'show'
-    end
-  end
-  
   def test_destroy_comment
     comments_count = News.find(1).comments.size
     @request.session[:user_id] = 2
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 0daaad6dc..4ce8fe4a7 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -160,7 +160,8 @@ class RoutingTest < ActionController::IntegrationTest
 
     should_route :post, "/projects/567/news", :controller => 'news', :action => 'create', :project_id => '567'
     should_route :post, "/news/567/destroy", :controller => 'news', :action => 'destroy', :id => '567'
-
+    should_route :post, "/news/567/comments", :controller => 'comments', :action => 'create', :id => '567'
+    
     should_route :put, "/news/567/edit", :controller => 'news', :action => 'update', :id => '567'
   end