X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6f375ef4936ea6e92e84b1473940af7883fba4d6..f0bcdae908c67dae7a74ac75be391be446dbdaae:/test/controllers/issues_controller_test.rb diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb index 4a7b19119..6df5e8bf3 100644 --- a/test/controllers/issues_controller_test.rb +++ b/test/controllers/issues_controller_test.rb @@ -21,153 +21,22 @@ class IssuesControllerTest < ActionController::TestCase # Access issues_path by admin session[:user] = create(:administrator_user).id get :index - # this is redirected because there are no issues?! - assert_response :redirect - assert_redirected_to issues_path + assert_response :success # Access issues_path by moderator session[:user] = create(:moderator_user).id get :index - # this is redirected because there are no issues?! - assert_response :redirect - assert_redirected_to issues_path - end - - def test_new_issue_without_login - # Test creation of a new issue and a new report without logging in - get :new, :params => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 1 } - assert_response :redirect - assert_redirected_to login_path(:referer => new_issue_path(:reportable_id => 1, :reportable_type => "User", :reported_user_id => 1)) - end - - def test_new_issue_after_login - # Test creation of a new issue and a new report - target_user = create(:user) - - # Login - session[:user] = create(:user).id - - assert_equal Issue.count, 0 - - # Create an Issue and a report - get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - assert_response :success - assert_difference "Issue.count", 1 do - details = "Details of a report" - post :create, - :params => { - :report => { :details => details }, - :report_type => "[OFFENSIVE]", - :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - } - end - assert_equal Issue.count, 1 - assert_response :redirect - assert_redirected_to root_path - end - - def test_new_report_with_incomplete_details - # Test creation of a new issue and a new report - target_user = create(:user) - - # Login - session[:user] = create(:user).id - - assert_equal Issue.count, 0 - - # Create an Issue and a report - get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - assert_response :success - assert_difference "Issue.count", 1 do - details = "Details of a report" - post :create, - :params => { - :report => { :details => details }, - :report_type => "[OFFENSIVE]", - :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - } - end - assert_equal Issue.count, 1 - assert_response :redirect - assert_redirected_to root_path - - get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - assert_response :success - - # 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", :reported_user_id => target_user.id } - } - end - assert_response :redirect - assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count, 1 - - # Report without details - assert_no_difference "Issue.count" do - post :create, - :params => { - :report_type => "[OFFENSIVE]", - :issue => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2 } - } - end - assert_response :redirect - assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count, 1 - end - - def test_new_report_with_complete_details - # Test creation of a new issue and a new report - target_user = create(:user) - - # Login - session[:user] = create(:user).id - - assert_equal Issue.count, 0 - - # Create an Issue and a report - get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } assert_response :success - assert_difference "Issue.count", 1 do - details = "Details of a report" - post :create, - :params => { - :report => { :details => details }, - :report_type => "[OFFENSIVE]", - :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - } - end - assert_equal Issue.count, 1 - assert_response :redirect - assert_redirected_to root_path - - # Create a report for an existing Issue - get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - assert_response :success - assert_no_difference "Issue.count" do - details = "Details of another report under the same issue" - post :create, - :params => { - :report => { :details => details }, - :report_type => "[OFFENSIVE]", - :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id } - } - end - assert_response :redirect - report_count = Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count - assert_equal report_count, 2 end def test_change_status_by_normal_user target_user = create(:user) - issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id) + issue = create(:issue, :reportable => target_user, :reported_user => target_user) # Login as normal user session[:user] = create(:user).id - assert_equal Issue.count, 1 + assert_equal 1, Issue.count get :resolve, :params => { :id => issue.id } @@ -177,31 +46,31 @@ class IssuesControllerTest < ActionController::TestCase def test_change_status_by_admin target_user = create(:user) - issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id) + issue = create(:issue, :reportable => target_user, :reported_user => target_user) # Login as administrator session[:user] = create(:administrator_user).id # Test 'Resolved' get :resolve, :params => { :id => issue.id } - assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").resolved?, true + assert_equal true, Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").resolved? assert_response :redirect # Test 'Reopen' get :reopen, :params => { :id => issue.id } - assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").open?, true + assert_equal true, Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").open? assert_response :redirect # Test 'Ignored' get :ignore, :params => { :id => issue.id } - assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user, "User").ignored?, true + assert_equal true, Issue.find_by(:reportable_id => target_user, :reportable_type => "User").ignored? assert_response :redirect end def test_search_issues good_user = create(:user) bad_user = create(:user) - create(:issue, :reportable => bad_user, :reported_user_id => bad_user.id, :issue_type => "administrator") + create(:issue, :reportable => bad_user, :reported_user => bad_user, :issue_type => "administrator") # Login as administrator session[:user] = create(:administrator_user).id @@ -219,26 +88,4 @@ class IssuesControllerTest < ActionController::TestCase get :index, :params => { :search_by_user => bad_user.display_name } assert_response :success end - - def test_comment_by_normal_user - issue = create(:issue) - - # Login as normal user - session[:user] = create(:user).id - - get :comment, :params => { :id => issue.id } - assert_response :redirect - assert_redirected_to root_path - end - - def test_comment - issue = create(:issue) - - # Login as administrator - session[:user] = create(:administrator_user).id - - get :comment, :params => { :id => issue.id, :issue_comment => { :body => "test comment" } } - assert_response :redirect - assert_redirected_to issue - end end