X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/25737ce46e27d98e2e48eee6ab996cad259c3b83..c3ad6aa2923c03aeeea0b57033b0a9238d262aa2:/test/controllers/issues_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 87eda1506..1696df498 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -1,7 +1,7 @@
-require 'test_helper'
+require "test_helper"
 
 class IssuesControllerTest < ActionController::TestCase
-  fixtures :users,:user_roles
+  fixtures :users, :user_roles, :issues
 
   def test_view_dashboard_without_auth
     # Access issues_path without login
@@ -18,19 +18,26 @@ class IssuesControllerTest < ActionController::TestCase
     # Access issues_path by admin
     session[:user] = users(:administrator_user).id
     get :index
-    assert_response :success
+    # this is redirected because there are no issues?!
+    assert_response :redirect
+    assert_redirected_to issues_path
 
     # Access issues_path by moderator
-    session[:user]= users(:moderator_user).id
+    session[:user] = users(:moderator_user).id
     get :index
-    assert_response :success
+    # this is redirected because there are no issues?!
+    assert_response :redirect
+    assert_redirected_to issues_path
+
+    # clear session
+    session.delete(:user)
   end
 
   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: "User", reported_user_id: 1}
+    get :new, :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))
+    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
@@ -39,20 +46,24 @@ class IssuesControllerTest < ActionController::TestCase
     # Login
     session[:user] = users(:normal_user).id
 
-    assert_equal Issue.count,0
-    
-    # Create an Issue and a report  
-    get :new, {reportable_id: 1, reportable_type: "User", reported_user_id: 2}
+    assert_equal Issue.count, 0
+
+    # Create an Issue and a report
+    get :new, :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2
     assert_response :success
-    assert_difference "Issue.count",1 do
+    assert_difference "Issue.count", 1 do
       details = "Details of a report"
-      post :create, { :report => { :details => details},
-                    :report_type => "[OFFENSIVE]",
-                    :issue => { reportable_id: 1, reportable_type: "User", reported_user_id: 2} }
+      post :create,
+           :report => { :details => details },
+           :report_type => "[OFFENSIVE]",
+           :issue => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2 }
     end
-    assert_equal Issue.count,1
+    assert_equal Issue.count, 1
     assert_response :redirect
     assert_redirected_to root_path
+
+    # clear session
+    session.delete(:user)
   end
 
   def test_new_report_with_incomplete_details
@@ -61,40 +72,46 @@ class IssuesControllerTest < ActionController::TestCase
     # Login
     session[:user] = users(:normal_user).id
 
-    assert_equal Issue.count,0
+    assert_equal Issue.count, 0
 
     # Create an Issue and a report
-    get :new, {reportable_id: 1, reportable_type: "User", reported_user_id: 2}
+    get :new, :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2
     assert_response :success
-    assert_difference "Issue.count",1 do
+    assert_difference "Issue.count", 1 do
       details = "Details of a report"
-      post :create, { :report => { :details => details},
-                      :report_type => "[OFFENSIVE]",
-                      :issue => { reportable_id: 1, reportable_type: "User", reported_user_id: 2} }
-    end 
-    assert_equal Issue.count,1
+      post :create,
+           :report => { :details => details },
+           :report_type => "[OFFENSIVE]",
+           :issue => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2 }
+    end
+    assert_equal Issue.count, 1
     assert_response :redirect
     assert_redirected_to root_path
-    
-    get :new, {reportable_id: 1, reportable_type: "User", reported_user_id: 2}
+
+    get :new, :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2
     assert_response :success
 
     # Report without report_type
     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: "User", reported_user_id: 2} }
+      post :create,
+           :report => { :details => details },
+           :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(1,"User").reports.count,1
+    assert_equal Issue.find_by_reportable_id_and_reportable_type(1, "User").reports.count, 1
 
     # Report without details
     assert_no_difference "Issue.count" do
-      post :create, { :report_type => "[OFFENSIVE]", 
-                      :issue => { reportable_id: 1, reportable_type: "User", reported_user_id: 2} }
+      post :create,
+           :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(1,"User").reports.count,1
+    assert_equal Issue.find_by_reportable_id_and_reportable_type(1, "User").reports.count, 1
+
+    # clear session
+    session.delete(:user)
   end
 
   def test_new_report_with_complete_details
@@ -103,46 +120,55 @@ class IssuesControllerTest < ActionController::TestCase
     # Login
     session[:user] = users(:normal_user).id
 
-    assert_equal Issue.count,0
+    assert_equal Issue.count, 0
 
     # Create an Issue and a report
-    get :new, {reportable_id: 1, reportable_type: "User", reported_user_id: 2}
+    get :new, :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2
     assert_response :success
-    assert_difference "Issue.count",1 do
+    assert_difference "Issue.count", 1 do
       details = "Details of a report"
-      post :create, { :report => { :details => details},
-                    :report_type => "[OFFENSIVE]",
-                    :issue => { reportable_id: 1, reportable_type: "User", reported_user_id: 2} }
+      post :create,
+           :report => { :details => details },
+           :report_type => "[OFFENSIVE]",
+           :issue => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2 }
     end
-    assert_equal Issue.count,1
+    assert_equal Issue.count, 1
     assert_response :redirect
     assert_redirected_to root_path
-    
+
     # Create a report for an existing Issue
-    get :new, {reportable_id: 1, reportable_type: "User", reported_user_id: 2}
+    get :new, :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2
     assert_response :success
     assert_no_difference "Issue.count" do
       details = "Details of another report under the same issue"
-      post :create, { :report => { :details => details},
-                      :report_type => "[OFFENSIVE]",      
-                      :issue => { reportable_id: 1, reportable_type: "User", reported_user_id: 2} }
+      post :create,
+           :report => { :details => details },
+           :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(1,"User").reports.count,2
+    report_count = Issue.find_by_reportable_id_and_reportable_type(1, "User").reports.count
+    assert_equal report_count, 2
+
+    # clear session
+    session.delete(:user)
   end
 
   def test_change_status_by_normal_user
     # Login as normal user
     session[:user] = users(:normal_user).id
-    
+
     # Create Issue
-    test_new_issue_after_login    
-    assert_equal Issue.count,1
-    
-    get :resolve, id: Issue.find_by_reportable_id_and_reportable_type(1,"User").id
+    test_new_issue_after_login
+    assert_equal Issue.count, 1
+
+    get :resolve, :id => Issue.find_by_reportable_id_and_reportable_type(1, "User").id
 
     assert_response :redirect
     assert_redirected_to root_path
+
+    # clear session
+    session.delete(:user)
   end
 
   def test_change_status_by_admin
@@ -151,26 +177,29 @@ class IssuesControllerTest < ActionController::TestCase
 
     # Create Issue
     test_new_issue_after_login
-    assert_equal Issue.count,1
+    assert_equal Issue.count, 1
     assert_response :redirect
 
     # Login as administrator
     session[:user] = users(:administrator_user).id
-   
+
     # Test 'Resolved'
-    get :resolve, id: Issue.find_by_reportable_id_and_reportable_type(1,"User").id
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"User").resolved?, true
+    get :resolve, :id => Issue.find_by_reportable_id_and_reportable_type(1, "User").id
+    assert_equal Issue.find_by_reportable_id_and_reportable_type(1, "User").resolved?, true
     assert_response :redirect
 
     # Test 'Reopen'
-    get :reopen, id: Issue.find_by_reportable_id_and_reportable_type(1,"User").id
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"User").open?, true
+    get :reopen, :id => Issue.find_by_reportable_id_and_reportable_type(1, "User").id
+    assert_equal Issue.find_by_reportable_id_and_reportable_type(1, "User").open?, true
     assert_response :redirect
 
     # Test 'Ignored'
-    get :ignore, id: Issue.find_by_reportable_id_and_reportable_type(1,"User").id
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(1,"User").ignored?, true
+    get :ignore, :id => Issue.find_by_reportable_id_and_reportable_type(1, "User").id
+    assert_equal Issue.find_by_reportable_id_and_reportable_type(1, "User").ignored?, true
     assert_response :redirect
+
+    # clear session
+    session.delete(:user)
   end
 
   def test_search_issues
@@ -178,25 +207,54 @@ class IssuesControllerTest < ActionController::TestCase
     session[:user] = users(:administrator_user).id
 
     # No issues against the user
-    get :index, search_by_user: "test1"
+    get :index, :search_by_user => "test1"
     assert_response :redirect
     assert_redirected_to issues_path
 
     # User doesn't exist
-    get :index, search_by_user: "test1000"
+    get :index, :search_by_user => "test1000"
     assert_response :redirect
     assert_redirected_to issues_path
 
     # Create Issue against user_id:2
     test_new_issue_after_login
-    assert_equal Issue.count,1
-    assert_equal Issue.first.reported_user_id,2
+    assert_equal Issue.count, 1
+    assert_equal Issue.first.reported_user_id, 2
 
     session[:user] = users(:administrator_user).id
 
     # Find Issue against user_id:2
-    get :index, search_by_user: "test2"
+    get :index, :search_by_user => "test2"
     assert_response :success
+
+    # clear session
+    session.delete(:user)
+  end
+
+  def test_comment_by_normal_user
+    # Create Issue
+    test_new_issue_after_login
+    assert_equal Issue.count, 1
+
+    get :comment, :id => 1
+    assert_response :redirect
+    assert_redirected_to root_path
   end
 
+  def test_comment
+    # Create Issue
+    test_new_issue_after_login
+    assert_equal Issue.count, 1
+    @issue = Issue.all.first
+
+    # Login as administrator
+    session[:user] = users(:administrator_user).id
+
+    get :comment, :id => @issue.id, :issue_comment => { :body => "test comment" }
+    assert_response :redirect
+    assert_redirected_to @issue
+
+    # clear session
+    session.delete(:user)
+  end
 end