Merge branch 'master' into feature/add-communities-page

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

diff --git a/test/system/report_user_test.rb b/test/system/report_user_test.rb
index 5bdf3c201c4914b0490e521f98e8d7f384ef476f..879558ab5fe05bb777f495d5c7c1afe68f424db9 100644 (file)
--- a/test/system/report_user_test.rb
+++ b/test/system/report_user_test.rb
@@ -4,9 +4,9 @@ class ReportUserTest < 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)
+    assert_content note.comments.first.body
 
-    assert_not page.has_content?(I18n.t("users.show.report"))
+    assert_no_content I18n.t("users.show.report")
   end
 
   def test_can_report_user
@@ -15,8 +15,8 @@ class ReportUserTest < ApplicationSystemTestCase
     visit user_path(user)
 
     click_on I18n.t("users.show.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.user.vandal_label")
     fill_in "report_details", :with => "This user is a vandal"
@@ -24,7 +24,7 @@ class ReportUserTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered successfully"
+    assert_content "Your report has been registered successfully"
 
     assert_equal user, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
@@ -36,8 +36,8 @@ class ReportUserTest < ApplicationSystemTestCase
     visit user_path(user)
 
     click_on I18n.t("users.show.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.user.vandal_label")
     fill_in "report_details", :with => "This user is a vandal"
@@ -45,7 +45,7 @@ class ReportUserTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered successfully"
+    assert_content "Your report has been registered successfully"
 
     assert_equal user, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
@@ -53,8 +53,8 @@ class ReportUserTest < ApplicationSystemTestCase
     visit user_path(user)
 
     click_on I18n.t("users.show.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.user.spam_label")
     fill_in "report_details", :with => "This user is a spammer"
@@ -62,7 +62,7 @@ class ReportUserTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered successfully"
+    assert_content "Your report has been registered successfully"
 
     assert_equal user, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role