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

[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 950deb6950855b77e696d6584df557260059ace2..9d232f8d465f2797a8a5917c603ec7248dc22251 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)
 
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert page.has_content?(@diary_entry.title)
 

-    assert_not page.has_content?(I18n.t("diary_entry.diary_entry.report"))
+    assert_not page.has_content?(I18n.t("diary_entries.diary_entry.report"))

   end
 
   def test_it_works
   end
 
   def test_it_works


@@ -18,11 +18,11 @@ class ReportDiaryEntryTest < 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_entry.report")
+    click_on I18n.t("diary_entries.diary_entry.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_entry.spam")
+    choose I18n.t("reports.new.categories.diary_entry.spam_label")

     fill_in "report_details", :with => "This is advertising"
     assert_difference "Issue.count", 1 do
       click_on "Create Report"
     fill_in "report_details", :with => "This is advertising"
     assert_difference "Issue.count", 1 do
       click_on "Create Report"


@@ -31,6 +31,7 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
     assert page.has_content? "Your report has been registered sucessfully"
 
     assert_equal @diary_entry, Issue.last.reportable
     assert page.has_content? "Your report has been registered sucessfully"
 
     assert_equal @diary_entry, Issue.last.reportable

+    assert_equal "administrator", Issue.last.assigned_role

   end
 
   def test_it_reopens_issue
   end
 
   def test_it_reopens_issue


@@ -41,11 +42,11 @@ class ReportDiaryEntryTest < 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_entry.report")
+    click_on I18n.t("diary_entries.diary_entry.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_entry.spam")
+    choose I18n.t("reports.new.categories.diary_entry.spam_label")

     fill_in "report_details", :with => "This is advertising"
     assert_no_difference "Issue.count" do
       click_on "Create Report"
     fill_in "report_details", :with => "This is advertising"
     assert_no_difference "Issue.count" do
       click_on "Create Report"