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

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

diff --git a/test/system/report_note_test.rb b/test/system/report_note_test.rb
index c5a70b488fc8807c599916edfe8a2b80a801d207..79894eb897d4a514e3ebb94b5a89a680a1bcedf5 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -3,47 +3,51 @@ require "application_system_test_case"
 class ReportNoteTest < ApplicationSystemTestCase
   def test_no_link_when_not_logged_in
     note = create(:note_with_comments)
-    visit browse_note_path(note)
-    assert page.has_content?(note.comments.first.body)
+    visit note_path(note)
+    assert_content note.comments.first.body
 
-    assert !page.has_content?(I18n.t("browse.note.report"))
+    assert_no_content I18n.t("notes.show.report")
   end
 
   def test_can_report_anonymous_notes
     note = create(:note_with_comments)
     sign_in_as(create(:user))
-    visit browse_note_path(note)
+    visit note_path(note)
 
-    click_on I18n.t("browse.note.report")
-    assert page.has_content? "Report"
-    assert page.has_content? I18n.t("issues.new.disclaimer.intro")
+    click_on I18n.t("notes.show.report")
+    assert_content "Report"
+    assert_content I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.categories.note.spam")
+    choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
-    click_on "Create Report"
+    assert_difference "Issue.count", 1 do
+      click_on "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 == note
+    assert_equal note, Issue.last.reportable
+    assert_equal "moderator", Issue.last.assigned_role
   end
 
   def test_can_report_notes_with_author
     note = create(:note_comment, :author => create(:user)).note
     sign_in_as(create(:user))
-    visit browse_note_path(note)
+    visit note_path(note)
 
-    click_on I18n.t("browse.note.report")
-    assert page.has_content? "Report"
-    assert page.has_content? I18n.t("issues.new.disclaimer.intro")
+    click_on I18n.t("notes.show.report")
+    assert_content "Report"
+    assert_content I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.categories.note.spam")
+    choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
-    click_on "Create Report"
+    assert_difference "Issue.count", 1 do
+      click_on "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 == note
+    assert_equal note, Issue.last.reportable
+    assert_equal "moderator", Issue.last.assigned_role
   end
 end