Use with_locale for the copyright page

[rails.git] / test / system / diary_entry_test.rb

diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index e890bba737a306b325f69d036069d183fd31b564..31e6d7b075e3ba3b9ebb07d6efc3177c0eedeca9 100644 (file)
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -10,9 +10,9 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
     sign_in_as(create(:user))
     visit diary_entries_path
 

-    click_on "Reply to this entry"
+    click_on "Send a message to the author"

 
 

-    assert page.has_content? "Send a new message"
+    assert_content "Send a new message"

     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
   end
 
     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
   end
 


@@ -22,7 +22,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
     sign_in_as(create(:user))
     visit diary_entries_path
 

-    assert_not page.has_content? @deleted_entry.title
+    assert_no_content @deleted_entry.title

   end
 
   test "deleted diary entries should be shown to administrators for review" do
   end
 
   test "deleted diary entries should be shown to administrators for review" do


@@ -31,16 +31,34 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 

-    assert page.has_content? @deleted_entry.title
+    assert_content @deleted_entry.title

   end
 
   test "deleted diary entries should not be shown to admins when the user is also deleted" do
   end
 
   test "deleted diary entries should not be shown to admins when the user is also deleted" do

-    @deleted_user = create(:user, :status => :deleted)
+    @deleted_user = create(:user, :deleted)

     @deleted_entry = create(:diary_entry, :visible => false, :user => @deleted_user)
 
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 
     @deleted_entry = create(:diary_entry, :visible => false, :user => @deleted_user)
 
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 

-    assert_not page.has_content? @deleted_entry.title
+    assert_no_content @deleted_entry.title
+  end
+
+  test "deleted diary comments should be hidden for regular users" do
+    @deleted_comment = create(:diary_comment, :diary_entry => @diary_entry, :visible => false)
+
+    sign_in_as(create(:user))
+    visit diary_entry_path(@diary_entry.user, @diary_entry)
+
+    assert_no_content @deleted_comment.body
+  end
+
+  test "deleted diary comments should be shown to administrators" do
+    @deleted_comment = create(:diary_comment, :diary_entry => @diary_entry, :visible => false)
+
+    sign_in_as(create(:administrator_user))
+    visit diary_entry_path(@diary_entry.user, @diary_entry)
+
+    assert_content @deleted_comment.body

   end
 end
   end
 end