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

[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..79894eb897d4a514e3ebb94b5a89a680a1bcedf5 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -3,49 +3,51 @@ require "application_system_test_case"
 class ReportNoteTest < ApplicationSystemTestCase
   def test_no_link_when_not_logged_in
     note = create(:note_with_comments)
 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_not 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))
   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("reports.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.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"
     end
 
     fill_in "report_details", :with => "This is spam"
     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 note, Issue.last.reportable
 
     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))
   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("reports.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.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"
     end
 
     fill_in "report_details", :with => "This is spam"
     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 note, Issue.last.reportable
 
     assert_equal note, Issue.last.reportable

+    assert_equal "moderator", Issue.last.assigned_role

   end
 end
   end
 end