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

[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 2f407ca60d0dbd700b83941dfe8a3a8ee6e2f971..0756c8af7350967f21a185d9aca7aa79092c22ab 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -3,18 +3,18 @@ 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_content note.comments.first.body
+    visit note_path(note)
+    assert_content note.description

 
 

-    assert_no_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")
+    click_on I18n.t("notes.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 


@@ -31,11 +31,12 @@ class ReportNoteTest < ApplicationSystemTestCase
   end
 
   def test_can_report_notes_with_author
   end
 
   def test_can_report_notes_with_author

-    note = create(:note_comment, :author => create(:user)).note
+    user = create(:user)
+    note = create(:note_comment, :author => user, :note => build(:note, :author => user)).note

     sign_in_as(create(:user))
     sign_in_as(create(:user))

-    visit browse_note_path(note)
+    visit note_path(note)

 
 

-    click_on I18n.t("browse.note.report")
+    click_on I18n.t("notes.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")