X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1766c3216f335721ce4259f4049c14439c1777dc..918a382cad0cf9f8cbf2a47359d48773065c88f6:/test/controllers/issues_controller_test.rb diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb index a77ef8660..ff99b0cdc 100644 --- a/test/controllers/issues_controller_test.rb +++ b/test/controllers/issues_controller_test.rb @@ -36,7 +36,7 @@ class IssuesControllerTest < ActionController::TestCase # 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 } @@ -53,39 +53,17 @@ class IssuesControllerTest < ActionController::TestCase # Test 'Resolved' get :resolve, :params => { :id => issue.id } - assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "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 => target_user.id, :reportable_type => "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 => target_user, :reportable_type => "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 => bad_user, :issue_type => "administrator") - # Login as administrator - session[:user] = create(:administrator_user).id - - # No issues against the user - get :index, :params => { :search_by_user => good_user.display_name } - assert_response :redirect - assert_redirected_to issues_path - - # User doesn't exist - get :index, :params => { :search_by_user => "test1000" } - assert_response :redirect - assert_redirected_to issues_path - - # Find Issue against bad_user - get :index, :params => { :search_by_user => bad_user.display_name } - assert_response :success - end end