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

[rails.git] / test / system / report_diary_comment_test.rb

diff --git a/test/system/report_diary_comment_test.rb b/test/system/report_diary_comment_test.rb
index 61879a32f0b3961ecd1ad7d69df9614e6d311539..3504ab061fdeb5c4270036efa49807b1a9c9427f 100644 (file)
--- a/test/system/report_diary_comment_test.rb
+++ b/test/system/report_diary_comment_test.rb
@@ -9,19 +9,19 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
 
   def test_no_link_when_not_logged_in
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
 
   def test_no_link_when_not_logged_in
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)

-    assert page.has_content?(@comment.body)
+    assert_content @comment.body

 
 

-    assert_not page.has_content?(I18n.t("diary_entries.diary_comment.report"))
+    assert_no_content I18n.t("diary_entries.diary_comment.report")

   end
 
   def test_it_works
     sign_in_as(create(:user))
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
   end
 
   def test_it_works
     sign_in_as(create(:user))
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)

-    assert page.has_content? @diary_entry.title
+    assert_content @diary_entry.title

 
     click_on I18n.t("diary_entries.diary_comment.report")
 
     click_on I18n.t("diary_entries.diary_comment.report")

-    assert page.has_content? "Report"
-    assert page.has_content? I18n.t("reports.new.disclaimer.intro")
+    assert_content "Report"
+    assert_content I18n.t("reports.new.disclaimer.intro")

 
     choose I18n.t("reports.new.categories.diary_comment.spam_label")
     fill_in "report_details", :with => "This comment is spam"
 
     choose I18n.t("reports.new.categories.diary_comment.spam_label")
     fill_in "report_details", :with => "This comment is spam"


@@ -29,7 +29,7 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
       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 @comment, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role
 
     assert_equal @comment, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role