Merge branch 'master' into next

[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 570fbb1de59503fc0f9c5c6b7085292d0d80bc65..15752777c5517f193afdcaee27a0d4fc3fa9e1d5 100644 (file)
--- a/test/system/report_diary_entry_test.rb
+++ b/test/system/report_diary_entry_test.rb
@@ -10,7 +10,7 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert page.has_content?(@diary_entry.title)
 
-    assert !page.has_content?(I18n.t("diary_entry.diary_entry.report"))
+    assert_not page.has_content?(I18n.t("diary_entry.diary_entry.report"))
   end
 
   def test_it_works
@@ -20,9 +20,9 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
 
     click_on I18n.t("diary_entry.diary_entry.report")
     assert page.has_content? "Report"
-    assert page.has_content? I18n.t("issues.new.disclaimer.intro")
+    assert page.has_content? I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.categories.diary_entry.spam")
+    choose I18n.t("reports.new.categories.diary_entry.spam")
     fill_in "report_details", :with => "This is advertising"
     click_on "Create Report"
 
@@ -39,14 +39,14 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
 
     click_on I18n.t("diary_entry.diary_entry.report")
     assert page.has_content? "Report"
-    assert page.has_content? I18n.t("issues.new.disclaimer.intro")
+    assert page.has_content? I18n.t("reports.new.disclaimer.intro")
 
-    choose I18n.t("reports.categories.diary_entry.spam")
+    choose I18n.t("reports.new.categories.diary_entry.spam")
     fill_in "report_details", :with => "This is advertising"
     click_on "Create Report"
 
     issue.reload
-    assert !issue.resolved?
+    assert_not issue.resolved?
     assert issue.open?
   end