X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8dc8479e12b50878ca6b476a4dd72fe1da1f24ad..40c3856906edead3bda4ddd42b80062a54e60764:/test/system/issues_test.rb?ds=inline

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 5ff1a5294..4c84d44fc 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -1,18 +1,25 @@
 require "application_system_test_case"
 
 class IssuesTest < ApplicationSystemTestCase
+  include IssuesHelper
+
+  def test_view_issues_not_logged_in
+    visit issues_path
+    assert page.has_content?(I18n.t("sessions.new.title"))
+  end
+
   def test_view_issues_normal_user
     sign_in_as(create(:user))
 
     visit issues_path
-    assert page.has_content?(I18n.t("application.require_admin.not_an_admin"))
+    assert page.has_content?("Forbidden")
   end
 
   def test_view_no_issues
     sign_in_as(create(:moderator_user))
 
     visit issues_path
-    assert page.has_content?(I18n.t(".issues.index.search.issues_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))
   end
 
   def test_view_issues
@@ -23,6 +30,18 @@ class IssuesTest < ApplicationSystemTestCase
     assert page.has_content?(issues.first.reported_user.display_name)
   end
 
+  def test_view_issues_with_no_reported_user
+    sign_in_as(create(:moderator_user))
+    anonymous_note = create(:note_with_comments)
+    issue = create(:issue, :reportable => anonymous_note, :assigned_role => "moderator")
+
+    visit issues_path
+    assert page.has_content?(reportable_title(anonymous_note))
+
+    visit issue_path(issue)
+    assert page.has_content?(reportable_title(anonymous_note))
+  end
+
   def test_search_issues_by_user
     good_user = create(:user)
     bad_user = create(:user)
@@ -34,34 +53,37 @@ class IssuesTest < ApplicationSystemTestCase
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"
-    assert page.has_content?(I18n.t(".issues.index.search.issues_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistant User"
     click_on "Search"
-    assert page.has_content?(I18n.t(".issues.index.search.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))
 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name
     click_on "Search"
-    assert !page.has_content?(I18n.t(".issues.index.search.issues_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.issues_not_found"))
   end
 
   def test_commenting
-    issue = create(:issue)
+    issue = create(:issue, :assigned_role => "moderator")
     sign_in_as(create(:moderator_user))
 
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"
-    click_on "Submit"
-    assert page.has_content?(I18n.t(".issues.comment.comment_created"))
+    click_on "Add Comment"
+    assert page.has_content?(I18n.t("issue_comments.create.comment_created"))
     assert page.has_content?("test comment")
 
     issue.reload
-    assert_equal issue.comments.first.body, "test comment"
+    assert_equal("test comment", issue.comments.first.body)
   end
 
   def test_reassign_issue
@@ -73,9 +95,25 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign
-    click_on "Submit"
+    click_on "Add Comment"
 
     issue.reload
     assert_equal "moderator", issue.assigned_role
   end
+
+  def test_issue_index_with_multiple_roles
+    user1 = create(:user)
+    user2 = create(:user)
+    issue1 = create(:issue, :reportable => user1, :assigned_role => "administrator")
+    issue2 = create(:issue, :reportable => user2, :assigned_role => "moderator")
+
+    user = create(:administrator_user)
+    create(:user_role, :user => user, :role => "moderator")
+    sign_in_as(user)
+
+    visit issues_path
+
+    assert page.has_link?(I18n.t("issues.index.reports_count", :count => issue1.reports_count), :href => issue_path(issue1))
+    assert page.has_link?(I18n.t("issues.index.reports_count", :count => issue2.reports_count), :href => issue_path(issue2))
+  end
 end