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

[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 05b76f695aeb6eaf230397b69567cf83b8d288f7..61879a32f0b3961ecd1ad7d69df9614e6d311539 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_entries.diary_comment.report"))

   end
 
   def test_it_works
   end
 
   def test_it_works


@@ -19,17 +19,19 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert page.has_content? @diary_entry.title
 
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert page.has_content? @diary_entry.title
 

-    click_on I18n.t("diary_entry.diary_comment.report")
+    click_on I18n.t("diary_entries.diary_comment.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")
 

-    choose I18n.t("reports.new.categories.diary_comment.spam")
+    choose I18n.t("reports.new.categories.diary_comment.spam_label")

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

-    click_on "Create Report"
+    assert_difference "Issue.count", 1 do
+      click_on "Create Report"
+    end

 
     assert page.has_content? "Your report has been registered sucessfully"
 
 
     assert page.has_content? "Your report has been registered sucessfully"
 

-    assert_equal 1, Issue.count
-    assert Issue.last.reportable == @comment
+    assert_equal @comment, Issue.last.reportable
+    assert_equal "administrator", Issue.last.assigned_role

   end
 end
   end
 end