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

[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..b7e1bfc9eaebd4c7252e383871d31b9cd28a6e40 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -3,25 +3,25 @@ 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)
+    visit note_path(note)

     assert_content note.comments.first.body
 
     assert_content note.comments.first.body
 

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

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     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"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"


@@ -33,16 +33,16 @@ class ReportNoteTest < ApplicationSystemTestCase
   def test_can_report_notes_with_author
     note = create(:note_comment, :author => create(:user)).note
     sign_in_as(create(:user))
   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")
+    click_link I18n.t("notes.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     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"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"