X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..HEAD:/test/controllers/reports_controller_test.rb

diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb
index 612ead2e6..25b80e8f4 100644
--- a/test/controllers/reports_controller_test.rb
+++ b/test/controllers/reports_controller_test.rb
@@ -1,34 +1,29 @@
 require "test_helper"
 
-class ReportsControllerTest < ActionController::TestCase
+class ReportsControllerTest < ActionDispatch::IntegrationTest
   def test_new_report_without_login
     target_user = create(:user)
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
-    assert_response :redirect
+    get new_report_path(:reportable_id => target_user.id, :reportable_type => "User")
     assert_redirected_to login_path(:referer => new_report_path(:reportable_id => target_user.id, :reportable_type => "User"))
   end
 
   def test_new_report_after_login
     target_user = create(:user)
 
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
     # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    get new_report_path(:reportable_id => target_user.id, :reportable_type => "User")
     assert_response :success
     assert_difference "Issue.count", 1 do
       details = "Details of a report"
       category = "other"
-      post :create,
-           :params => {
-             :report => {
-               :details => details,
-               :category => category,
-               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
-             }
-           }
+      post reports_path(:report => {
+                          :details => details,
+                          :category => category,
+                          :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+                        })
     end
-    assert_response :redirect
     assert_redirected_to user_path(target_user)
   end
 
@@ -37,45 +32,40 @@ class ReportsControllerTest < ActionController::TestCase
     target_user = create(:user)
 
     # Login
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
     # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    get new_report_path(:reportable_id => target_user.id, :reportable_type => "User")
     assert_response :success
     assert_difference "Issue.count", 1 do
       details = "Details of a report"
       category = "other"
-      post :create,
-           :params => {
-             :report => {
-               :details => details,
-               :category => category,
-               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
-             }
-           }
+      post reports_path(:report => {
+                          :details => details,
+                          :category => category,
+                          :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+                        })
     end
-    assert_response :redirect
     assert_redirected_to user_path(target_user)
 
     issue = Issue.last
 
     assert_equal 1, issue.reports.count
 
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    get new_report_path(:reportable_id => target_user.id, :reportable_type => "User")
     assert_response :success
 
     # Report without details
     assert_no_difference "Issue.count" do
       category = "other"
-      post :create,
-           :params => {
-             :report => {
-               :category => category,
-               :issue => { :reportable_id => 1, :reportable_type => "User" }
-             }
-           }
+      post reports_path(:report => {
+                          :category => category,
+                          :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+                        })
     end
-    assert_response :redirect
+    assert_response :success
+    assert_template :new
+    assert_match(/Please provide the required details/, flash[:notice])
 
     assert_equal 1, issue.reports.count
   end
@@ -85,24 +75,20 @@ class ReportsControllerTest < ActionController::TestCase
     target_user = create(:user)
 
     # Login
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
     # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    get new_report_path(:reportable_id => target_user.id, :reportable_type => "User")
     assert_response :success
     assert_difference "Issue.count", 1 do
       details = "Details of a report"
       category = "other"
-      post :create,
-           :params => {
-             :report => {
-               :details => details,
-               :category => category,
-               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
-             }
-           }
+      post reports_path(:report => {
+                          :details => details,
+                          :category => category,
+                          :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+                        })
     end
-    assert_response :redirect
     assert_redirected_to user_path(target_user)
 
     issue = Issue.last
@@ -110,19 +96,16 @@ class ReportsControllerTest < ActionController::TestCase
     assert_equal 1, issue.reports.count
 
     # Create a report for an existing Issue
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    get new_report_path(:reportable_id => target_user.id, :reportable_type => "User")
     assert_response :success
     assert_no_difference "Issue.count" do
       details = "Details of another report under the same issue"
       category = "other"
-      post :create,
-           :params => {
-             :report => {
-               :details => details,
-               :category => category,
-               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
-             }
-           }
+      post reports_path(:report => {
+                          :details => details,
+                          :category => category,
+                          :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+                        })
     end
     assert_response :redirect