Merge remote-tracking branch 'upstream/pull/5375'

[rails.git] / test / controllers / issue_comments_controller_test.rb

diff --git a/test/controllers/issue_comments_controller_test.rb b/test/controllers/issue_comments_controller_test.rb
index d9b4062c7a78601f3d25e0c5d72129b5e66e4e73..823d07776f7cf371d3d94ac3e626e37553264cb1 100644 (file)
--- a/test/controllers/issue_comments_controller_test.rb
+++ b/test/controllers/issue_comments_controller_test.rb
@@ -1,15 +1,14 @@
 require "test_helper"
 
 require "test_helper"
 

-class IssueCommentsControllerTest < ActionController::TestCase
+class IssueCommentsControllerTest < ActionDispatch::IntegrationTest

   def test_comment_by_normal_user
     issue = create(:issue)
 
     # Login as normal user
   def test_comment_by_normal_user
     issue = create(:issue)
 
     # Login as normal user

-    session[:user] = create(:user).id
+    session_for(create(:user))

 
 

-    post :create, :params => { :issue_id => issue.id }
-    assert_response :redirect
-    assert_redirected_to root_path
+    post issue_comments_path(:issue_id => issue)
+    assert_redirected_to :controller => :errors, :action => :forbidden

     assert_equal 0, issue.comments.length
   end
 
     assert_equal 0, issue.comments.length
   end
 


@@ -17,10 +16,9 @@ class IssueCommentsControllerTest < ActionController::TestCase
     issue = create(:issue)
 
     # Login as administrator
     issue = create(:issue)
 
     # Login as administrator

-    session[:user] = create(:administrator_user).id
+    session_for(create(:administrator_user))

 
 

-    post :create, :params => { :issue_id => issue.id, :issue_comment => { :body => "test comment" } }
-    assert_response :redirect
+    post issue_comments_path(:issue_id => issue, :issue_comment => { :body => "test comment" })

     assert_redirected_to issue
     assert_equal 1, issue.comments.length
   end
     assert_redirected_to issue
     assert_equal 1, issue.comments.length
   end