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

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

diff --git a/test/system/report_diary_entry_test.rb b/test/system/report_diary_entry_test.rb
index 9d232f8d465f2797a8a5917c603ec7248dc22251..efb1070653de48b766cdaf7c5dc6221cdd5bbf97 100644 (file)
--- a/test/system/report_diary_entry_test.rb
+++ b/test/system/report_diary_entry_test.rb
@@ -8,19 +8,19 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
 
   def test_no_link_when_not_logged_in
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
-    assert page.has_content?(@diary_entry.title)
+    assert_content @diary_entry.title
 
-    assert_not page.has_content?(I18n.t("diary_entries.diary_entry.report"))
+    assert_no_content I18n.t("diary_entries.diary_entry.report")
   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_entry.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_entry.spam_label")
     fill_in "report_details", :with => "This is advertising"
@@ -28,7 +28,7 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
       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 @diary_entry, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role
@@ -40,11 +40,11 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
 
     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_entry.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_entry.spam_label")
     fill_in "report_details", :with => "This is advertising"
@@ -54,12 +54,12 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
 
     issue.reload
     assert_not issue.resolved?
-    assert issue.open?
+    assert_predicate issue, :open?
   end
 
   def test_missing_report_params
     sign_in_as(create(:user))
     visit new_report_path
-    assert page.has_content? I18n.t("reports.new.missing_params")
+    assert_content I18n.t("reports.new.missing_params")
   end
 end