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

[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 f885888349a709a3c3c63d968ecd7ddf87273e57..93e73cf5aaf7885f01063a8cd48ec91859748588 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -6,7 +6,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     visit browse_note_path(note)
     assert page.has_content?(note.comments.first.body)
 
-    assert !page.has_content?(I18n.t("browse.note.report"))
+    assert_not page.has_content?(I18n.t("browse.note.report"))
   end
 
   def test_can_report_anonymous_notes
@@ -18,14 +18,16 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert page.has_content? "Report"
     assert page.has_content? I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.new.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_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
@@ -37,13 +39,15 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert page.has_content? "Report"
     assert page.has_content? I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.new.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_equal 1, Issue.count
-    assert Issue.last.reportable == note
+    assert_equal note, Issue.last.reportable
+    assert_equal "moderator", Issue.last.assigned_role
   end
 end