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

[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 a18366d011d37e3a73186c3576f47e5a760b50b7..93e73cf5aaf7885f01063a8cd48ec91859748588 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -18,7 +18,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert page.has_content? "Report"
     assert page.has_content? I18n.t("reports.new.disclaimer.intro")
 
     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"
     assert_difference "Issue.count", 1 do
       click_on "Create Report"
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do
       click_on "Create Report"


@@ -27,6 +27,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert page.has_content? "Your report has been registered sucessfully"
 
     assert_equal note, Issue.last.reportable
     assert page.has_content? "Your report has been registered sucessfully"
 
     assert_equal note, Issue.last.reportable

+    assert_equal "moderator", Issue.last.assigned_role

   end
 
   def test_can_report_notes_with_author
   end
 
   def test_can_report_notes_with_author


@@ -38,7 +39,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert page.has_content? "Report"
     assert page.has_content? I18n.t("reports.new.disclaimer.intro")
 
     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"
     assert_difference "Issue.count", 1 do
       click_on "Create Report"
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do
       click_on "Create Report"


@@ -47,5 +48,6 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert page.has_content? "Your report has been registered sucessfully"
 
     assert_equal note, Issue.last.reportable
     assert page.has_content? "Your report has been registered sucessfully"
 
     assert_equal note, Issue.last.reportable

+    assert_equal "moderator", Issue.last.assigned_role

   end
 end
   end
 end