Merge branch 'master' into next

[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 8b709195d81c12745270d4d112766b7741655ac5..852bcfa65d6d3a7fece6d822db7d8a8e571c6fd3 100644 (file)
--- a/test/system/report_diary_comment_test.rb
+++ b/test/system/report_diary_comment_test.rb
@@ -11,7 +11,7 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert page.has_content?(@comment.body)
 
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert page.has_content?(@comment.body)
 

-    assert !page.has_content?(I18n.t("diary_entry.diary_comment.report"))
+    assert_not page.has_content?(I18n.t("diary_entry.diary_comment.report"))

   end
 
   def test_it_works
   end
 
   def test_it_works


@@ -21,9 +21,9 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
 
     click_on I18n.t("diary_entry.diary_comment.report")
     assert page.has_content? "Report"
 
     click_on I18n.t("diary_entry.diary_comment.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_comment.spam")
+    choose I18n.t("reports.new.categories.diary_comment.spam")

     fill_in "report_details", :with => "This comment is spam"
     click_on "Create Report"
 
     fill_in "report_details", :with => "This comment is spam"
     click_on "Create Report"