X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cf4cfc530ae54abee7b6a0dccbc9d4603ab35611..918a382cad0cf9f8cbf2a47359d48773065c88f6:/test/controllers/issues_controller_test.rb

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 6eacac11d..ff99b0cdc 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -1,109 +1,69 @@
-require 'test_helper'
+require "test_helper"
 
 class IssuesControllerTest < ActionController::TestCase
-  fixtures :users,:user_roles
-
-  def test_new_issue_without_login
-    # Test creation of a new issue and a new report without logging in
-    get :new, {reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1}
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => new_issue_path(:reportable_id=>1, :reportable_type=>"DiaryEntry",:reported_user_id=> 1))
+  teardown do
+    # cleanup any emails set off by the test
+    ActionMailer::Base.deliveries.clear
   end
 
-  def test_new_issue_after_login
-    # Test creation of a new issue and a new report
-
-    # Login
-    session[:user] = users(:normal_user).id
-
-    get :new, {reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1}
-    assert_response :success
-    assert_difference "Issue.count",1 do 
-      details = "Details of a report"
-      post :create, { :report => { :details => details},
-                      :issue => { reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1} }
-    end
+  def test_view_dashboard_without_auth
+    # Access issues_path without login
+    get :index
     assert_response :redirect
-  end
+    assert_redirected_to login_path(:referer => issues_path)
 
-  def test_new_report
-    # Test creation of a new report for an existing issue
-
-    # Login
-    session[:user] = users(:normal_user).id
+    # Access issues_path as normal user
+    session[:user] = create(:user).id
+    get :index
+    assert_response :redirect
+    assert_redirected_to root_path
 
-    get :new, {reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1}
+    # Access issues_path by admin
+    session[:user] = create(:administrator_user).id
+    get :index
     assert_response :success
-    assert_difference "Issue.count",1 do 
-      details = "Details of a report"
-      post :create, { :report => { :details => details},
-                      :issue => { reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1} }
-    end
-    assert_response :redirect
-    
-    get :new, {reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1}
+
+    # Access issues_path by moderator
+    session[:user] = create(:moderator_user).id
+    get :index
     assert_response :success
-    assert_no_difference "Issue.count" do
-      details = "Details of another report under the same issue"
-      post :create, { :report => { :details => details},
-                      :issue => { reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1} }
-    end
-    assert_response :redirect
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").reports.count,2
   end
 
   def test_change_status_by_normal_user
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
+
     # Login as normal user
-    session[:user] = users(:normal_user).id
-    
-    # Create Issue
+    session[:user] = create(:user).id
+
+    assert_equal 1, Issue.count
+
+    get :resolve, :params => { :id => issue.id }
 
-    get :new, {reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1}
-    assert_response :success
-    assert_difference "Issue.count",1 do 
-      details = "Details of a report"
-      post :create, { :report => { :details => details},
-                      :issue => { reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1} }
-    end
-    assert_response :redirect
-    
-    get :resolve, id: Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").id
     assert_response :redirect
     assert_redirected_to root_path
   end
 
   def test_change_status_by_admin
-    # Login as normal user
-    session[:user] = users(:normal_user).id
-
-    # Create Issue
-
-    get :new, {reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1}
-    assert_response :success
-    assert_difference "Issue.count",1 do 
-      details = "Details of a report"
-      post :create, { :report => { :details => details},
-                      :issue => { reportable_id: 1, reportable_type: "DiaryEntry", reported_user_id: 1} }
-    end
-    assert_response :redirect
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
     # Login as administrator
-    session[:user] = users(:administrator_user).id
-   
+    session[:user] = create(:administrator_user).id
+
     # Test 'Resolved'
-    get :resolve, id: Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").id
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").resolved?, true
+    get :resolve, :params => { :id => issue.id }
+    assert_equal true, Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").resolved?
     assert_response :redirect
 
     # Test 'Reopen'
-    get :reopen, id: Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").id
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").open?, true
+    get :reopen, :params => { :id => issue.id }
+    assert_equal true, Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").open?
     assert_response :redirect
 
     # Test 'Ignored'
-    get :ignore, id: Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").id
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"DiaryEntry").ignored?, true
+    get :ignore, :params => { :id => issue.id }
+    assert_equal true, Issue.find_by(:reportable_id => target_user, :reportable_type => "User").ignored?
     assert_response :redirect
   end
-
 end