X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31edc7dff6f4305366d0f93d35ba3fb1956bb71f..4eba549b5c0c2d01d0476ceaff894db6723177ee:/test/system/issues_test.rb?ds=sidebyside

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 08b1acb34..b9b989c07 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -5,21 +5,21 @@ class IssuesTest < ApplicationSystemTestCase
 
   def test_view_issues_not_logged_in
     visit issues_path
-    assert page.has_content?(I18n.t("users.login.title"))
+    assert_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?("Forbidden")
+    assert_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.issues_not_found"))
+    assert_content I18n.t("issues.index.issues_not_found")
   end
 
   def test_view_issues
@@ -27,7 +27,35 @@ class IssuesTest < ApplicationSystemTestCase
     issues = create_list(:issue, 3, :assigned_role => "moderator")
 
     visit issues_path
-    assert page.has_content?(issues.first.reported_user.display_name)
+    assert_content issues.first.reported_user.display_name
+  end
+
+  def test_view_issue_with_report
+    sign_in_as(create(:moderator_user))
+    issue = create(:issue, :assigned_role => "moderator")
+    issue.reports << create(:report, :details => "test report text **with kramdown**")
+
+    visit issue_path(issue)
+    assert_content I18n.t("issues.show.reports", :count => 1)
+    assert_content "test report text with kramdown"
+    assert_selector "strong", :text => "with kramdown"
+  end
+
+  def test_view_issue_rich_text_container
+    sign_in_as(create(:moderator_user))
+    issue = create(:issue, :assigned_role => "moderator")
+    issue.reports << create(:report, :details => "paragraph one\n\n---\n\nparagraph two")
+
+    visit issue_path(issue)
+    assert_content I18n.t("issues.show.reports", :count => 1)
+    richtext = find "div.richtext"
+    richtext_elements = richtext.all "*"
+    assert_equal 3, richtext_elements.size
+    assert_equal "p", richtext_elements[0].tag_name
+    assert_equal "paragraph one", richtext_elements[0].text
+    assert_equal "hr", richtext_elements[1].tag_name
+    assert_equal "p", richtext_elements[2].tag_name
+    assert_equal "paragraph two", richtext_elements[2].text
   end
 
   def test_view_issues_with_no_reported_user
@@ -36,10 +64,10 @@ class IssuesTest < ApplicationSystemTestCase
     issue = create(:issue, :reportable => anonymous_note, :assigned_role => "moderator")
 
     visit issues_path
-    assert page.has_content?(reportable_title(anonymous_note))
+    assert_content reportable_title(anonymous_note)
 
     visit issue_path(issue)
-    assert page.has_content?(reportable_title(anonymous_note))
+    assert_content reportable_title(anonymous_note)
   end
 
   def test_search_issues_by_user
@@ -53,37 +81,37 @@ class IssuesTest < ApplicationSystemTestCase
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"
-    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
-    assert page.has_content?(I18n.t("issues.index.issues_not_found"))
+    assert_no_content I18n.t("issues.index.user_not_found")
+    assert_content I18n.t("issues.index.issues_not_found")
 
     # User doesn't exist
     visit issues_path
-    fill_in "search_by_user", :with => "Nonexistant User"
+    fill_in "search_by_user", :with => "Nonexistent User"
     click_on "Search"
-    assert page.has_content?(I18n.t("issues.index.user_not_found"))
-    assert page.has_content?(I18n.t("issues.index.issues_not_found"))
+    assert_content I18n.t("issues.index.user_not_found")
+    assert_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_not page.has_content?(I18n.t("issues.index.user_not_found"))
-    assert_not page.has_content?(I18n.t("issues.index.issues_not_found"))
+    assert_no_content I18n.t("issues.index.user_not_found")
+    assert_no_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 "Add Comment"
-    assert page.has_content?(I18n.t("issue_comments.create.comment_created"))
-    assert page.has_content?("test comment")
+    assert_content I18n.t("issue_comments.create.comment_created")
+    assert_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
@@ -97,10 +125,27 @@ class IssuesTest < ApplicationSystemTestCase
     check :reassign
     click_on "Add Comment"
 
+    assert_content "and the issue was reassigned"
+    assert_current_path issues_path(:status => "open")
+
     issue.reload
     assert_equal "moderator", issue.assigned_role
   end
 
+  def test_reassign_issue_as_super_user
+    issue = create(:issue)
+    sign_in_as(create(:super_user))
+
+    visit issue_path(issue)
+
+    fill_in :issue_comment_body, :with => "reassigning to moderators"
+    check :reassign
+    click_on "Add Comment"
+
+    assert_content "and the issue was reassigned"
+    assert_current_path issue_path(issue)
+  end
+
   def test_issue_index_with_multiple_roles
     user1 = create(:user)
     user2 = create(:user)
@@ -113,7 +158,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     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))
+    assert_link I18n.t("issues.index.reports_count", :count => issue1.reports_count), :href => issue_path(issue1)
+    assert_link I18n.t("issues.index.reports_count", :count => issue2.reports_count), :href => issue_path(issue2)
   end
 end