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

[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 00c80f32cf4afd379bbcfe87310a7124e5f8117b..99d244ff1c2f94d8b1213a0bd8263669e101ff10 100644 (file)
--- a/test/controllers/issue_comments_controller_test.rb
+++ b/test/controllers/issue_comments_controller_test.rb
@@ -1,24 +1,25 @@
 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 }
+    post issue_comments_path(:issue_id => issue)

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to root_path
+    assert_redirected_to :controller => :errors, :action => :forbidden
+    assert_equal 0, issue.comments.length

   end
 
   def test_comment
     issue = create(:issue)
 
     # Login as administrator
   end
 
   def test_comment
     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" } }
+    post issue_comments_path(:issue_id => issue, :issue_comment => { :body => "test comment" })

     assert_response :redirect
     assert_redirected_to issue
     assert_equal 1, issue.comments.length
     assert_response :redirect
     assert_redirected_to issue
     assert_equal 1, issue.comments.length