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

[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 3dfbf4f1f47947bfe7a54e479faadc091d4cba01..7b49f2997109b4e3738f5e553609718ba8519d61 100644 (file)
--- a/test/system/report_user_test.rb
+++ b/test/system/report_user_test.rb
@@ -6,15 +6,15 @@ class ReportUserTest < ApplicationSystemTestCase
     visit browse_note_path(note)
     assert page.has_content?(note.comments.first.body)
 
     visit browse_note_path(note)
     assert page.has_content?(note.comments.first.body)
 

-    assert_not page.has_content?(I18n.t("user.show.report"))
+    assert_not page.has_content?(I18n.t("users.show.report"))

   end
 
   def test_can_report_user
     user = create(:user)
     sign_in_as(create(:user))
   end
 
   def test_can_report_user
     user = create(:user)
     sign_in_as(create(:user))

-    visit user_path(user.display_name)
+    visit user_path(user)

 
 

-    click_on I18n.t("user.show.report")
+    click_on I18n.t("users.show.report")

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


@@ -33,9 +33,9 @@ class ReportUserTest < ApplicationSystemTestCase
   def test_it_promotes_issues
     user = create(:user)
     sign_in_as(create(:user))
   def test_it_promotes_issues
     user = create(:user)
     sign_in_as(create(:user))

-    visit user_path(user.display_name)
+    visit user_path(user)

 
 

-    click_on I18n.t("user.show.report")
+    click_on I18n.t("users.show.report")

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


@@ -50,9 +50,9 @@ class ReportUserTest < ApplicationSystemTestCase
     assert_equal user, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
 
     assert_equal user, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
 

-    visit user_path(user.display_name)
+    visit user_path(user)

 
 

-    click_on I18n.t("user.show.report")
+    click_on I18n.t("users.show.report")

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