Merge remote-tracking branch 'upstream/pull/4358'

[rails.git] / test / system / report_diary_comment_test.rb

diff --git a/test/system/report_diary_comment_test.rb b/test/system/report_diary_comment_test.rb
index 05b76f695aeb6eaf230397b69567cf83b8d288f7..15ef1ad3c5177f8ff0e01cf8d689395dc08bb8a4 100644 (file)
--- a/test/system/report_diary_comment_test.rb
+++ b/test/system/report_diary_comment_test.rb
@@ -9,27 +9,29 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
 
   def test_no_link_when_not_logged_in
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
-    assert page.has_content?(@comment.body)
+    assert_content @comment.body
 
-    assert !page.has_content?(I18n.t("diary_entry.diary_comment.report"))
+    assert_no_content I18n.t("diary_entries.diary_comment.report")
   end
 
   def test_it_works
     sign_in_as(create(:user))
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
-    assert page.has_content? @diary_entry.title
+    assert_content @diary_entry.title
 
-    click_on I18n.t("diary_entry.diary_comment.report")
-    assert page.has_content? "Report"
-    assert page.has_content? I18n.t("reports.new.disclaimer.intro")
+    click_link I18n.t("diary_entries.diary_comment.report")
+    assert_content "Report"
+    assert_content I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.new.categories.diary_comment.spam")
+    choose I18n.t("reports.new.categories.diary_comment.spam_label")
     fill_in "report_details", :with => "This comment is spam"
-    click_on "Create Report"
+    assert_difference "Issue.count", 1 do
+      click_button "Create Report"
+    end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert_content "Your report has been registered successfully"
 
-    assert_equal 1, Issue.count
-    assert Issue.last.reportable == @comment
+    assert_equal @comment, Issue.last.reportable
+    assert_equal "administrator", Issue.last.assigned_role
   end
 end