X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0bcdae908c67dae7a74ac75be391be446dbdaae..d9baad5fd904c8b3c5e4ceee0d321a0c7cdde505:/test/controllers/reports_controller_test.rb diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb index 9c39350f9..8374e76d9 100644 --- a/test/controllers/reports_controller_test.rb +++ b/test/controllers/reports_controller_test.rb @@ -1,9 +1,9 @@ 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" } + get new_report_path(:reportable_id => target_user.id, :reportable_type => "User") assert_response :redirect assert_redirected_to login_path(:referer => new_report_path(:reportable_id => target_user.id, :reportable_type => "User")) end @@ -11,26 +11,22 @@ class ReportsControllerTest < ActionController::TestCase def test_new_report_after_login target_user = create(:user) - session[:user] = create(:user).id - - assert_equal 0, Issue.count + 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" - post :create, - :params => { - :report => { - :details => details, - :issue => { :reportable_id => target_user.id, :reportable_type => "User" } - } - } + category = "other" + post reports_path(:report => { + :details => details, + :category => category, + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) end - assert_equal 1, Issue.count assert_response :redirect - assert_redirected_to root_path + assert_redirected_to user_path(target_user) end def test_new_report_with_incomplete_details @@ -38,55 +34,43 @@ class ReportsControllerTest < ActionController::TestCase target_user = create(:user) # Login - session[:user] = create(:user).id - - assert_equal 0, Issue.count + 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" - post :create, - :params => { - :report => { - :details => details, - :issue => { :reportable_id => target_user.id, :reportable_type => "User" } - } - } + category = "other" + post reports_path(:report => { + :details => details, + :category => category, + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) end - assert_equal 1, Issue.count assert_response :redirect - assert_redirected_to root_path + assert_redirected_to user_path(target_user) - get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" } - assert_response :success + issue = Issue.last - # Report without report_type - assert_no_difference "Issue.count" do - details = "Details of another report under the same issue" - post :create, - :params => { - :report => { - :details => details, - :issue => { :reportable_id => target_user.id, :reportable_type => "User" } - } - } - end - assert_response :redirect - assert_equal 1, Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count + assert_equal 1, issue.reports.count + + get new_report_path(:reportable_id => target_user.id, :reportable_type => "User") + assert_response :success # Report without details assert_no_difference "Issue.count" do - post :create, - :params => { - :report => { - :issue => { :reportable_id => 1, :reportable_type => "User" } - } - } + category = "other" + post reports_path(:report => { + :category => category, + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) end - assert_response :redirect - assert_equal 1, Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count + assert_response :success + assert_template :new + assert_match(/Please provide the required details/, flash[:notice]) + + assert_equal 1, issue.reports.count end def test_new_report_with_complete_details @@ -94,42 +78,41 @@ class ReportsControllerTest < ActionController::TestCase target_user = create(:user) # Login - session[:user] = create(:user).id - - assert_equal 0, Issue.count + 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" - post :create, - :params => { - :report => { - :details => details, - :issue => { :reportable_id => target_user.id, :reportable_type => "User" } - } - } + category = "other" + post reports_path(:report => { + :details => details, + :category => category, + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) end - assert_equal 1, Issue.count assert_response :redirect - assert_redirected_to root_path + assert_redirected_to user_path(target_user) + + issue = Issue.last + + 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" - post :create, - :params => { - :report => { - :details => details, - :issue => { :reportable_id => target_user.id, :reportable_type => "User" } - } - } + category = "other" + post reports_path(:report => { + :details => details, + :category => category, + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) end assert_response :redirect - report_count = Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count - assert_equal 2, report_count + + assert_equal 2, issue.reports.count end end