Replace messages fixtures with a factory.

[rails.git] / test / controllers / diary_entry_controller_test.rb

diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index cbe72a6dfb8c3fcd6bf5616c5084dbd7d169bae5..6ab40e18992a6cff95809204150f95299167ff49 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class DiaryEntryControllerTest < ActionController::TestCase
-  fixtures :users, :user_roles, :languages, :friends
+  fixtures :users, :user_roles, :languages
 
   include ActionView::Helpers::NumberHelper
 
@@ -213,7 +213,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_edit
-    entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    entry = create(:diary_entry, :user => users(:normal_user))
 
     # Make sure that you are redirected to the login page when you are
     # not logged in, without and with the id of the entry you want to edit
@@ -317,7 +317,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_comment
-    entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    entry = create(:diary_entry, :user => users(:normal_user))
 
     # Make sure that you are denied when you are not logged in
     post :comment, :display_name => entry.user.display_name, :id => entry.id
@@ -330,6 +330,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
 
+    post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id }
+
     # Now try an invalid comment with an empty body
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "DiaryComment.count" do
@@ -353,7 +355,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [users(:normal_user).email], email.to
-    assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject
+    assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on a diary entry", email.subject
     assert_match /New comment/, email.text_part.decoded
     assert_match /New comment/, email.html_part.decoded
     ActionMailer::Base.deliveries.clear
@@ -375,7 +377,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   def test_comment_spammy
     # Find the entry to comment on
-    entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    entry = create(:diary_entry, :user => users(:normal_user))
+    post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id }
 
     # Generate some spammy content
     spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
@@ -390,7 +393,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [users(:normal_user).email], email.to
-    assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject
+    assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on a diary entry", email.subject
     assert_match %r{http://example.com/spam}, email.text_part.decoded
     assert_match %r{http://example.com/spam}, email.html_part.decoded
     ActionMailer::Base.deliveries.clear
@@ -414,7 +417,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   def test_list_all
     diary_entry = create(:diary_entry)
     geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
-    public_entry = create(:diary_entry, :user_id => users(:public_user).id)
+    public_entry = create(:diary_entry, :user => users(:public_user))
 
     # Try a list of all diary entries
     get :list
@@ -422,9 +425,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_user
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
-    geo_entry = create(:diary_entry, :user_id => users(:normal_user).id, :latitude => 51.50763, :longitude => -0.10781)
-    _other_entry = create(:diary_entry, :user_id => users(:public_user).id)
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
+    geo_entry = create(:diary_entry, :user => users(:normal_user), :latitude => 51.50763, :longitude => -0.10781)
+    _other_entry = create(:diary_entry, :user => users(:public_user))
 
     # Try a list of diary entries for a valid user
     get :list, :display_name => users(:normal_user).display_name
@@ -437,8 +440,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_friends
-    diary_entry = create(:diary_entry, :user_id => friends(:normal_user_with_second_user).friend_user_id)
-    _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id)
+    friend = create(:friend, :befriender => users(:normal_user))
+    diary_entry = create(:diary_entry, :user => friend.befriendee)
+    _other_entry = create(:diary_entry, :user => users(:second_public_user))
 
     # Try a list of diary entries for your friends when not logged in
     get :list, :friends => true
@@ -453,7 +457,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_nearby
-    diary_entry = create(:diary_entry, :user_id => users(:public_user).id)
+    diary_entry = create(:diary_entry, :user => users(:public_user))
 
     # Try a list of diary entries for nearby users when not logged in
     get :list, :nearby => true
@@ -525,9 +529,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_rss_user
-    create(:diary_entry, :user_id => users(:normal_user).id)
-    create(:diary_entry, :user_id => users(:normal_user).id)
-    create(:diary_entry, :user_id => users(:public_user).id)
+    create(:diary_entry, :user => users(:normal_user))
+    create(:diary_entry, :user => users(:normal_user))
+    create(:diary_entry, :user => users(:public_user))
 
     get :rss, :display_name => users(:normal_user).display_name, :format => :rss
     assert_response :success, "Should be able to get a specific users diary RSS"
@@ -550,23 +554,23 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   def test_view
     # Try a normal entry that should work
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
     get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
     assert_response :success
     assert_template :view
 
     # Try a deleted entry
-    diary_entry_deleted = create(:diary_entry, :user_id => users(:normal_user).id, :visible => false)
+    diary_entry_deleted = create(:diary_entry, :user => users(:normal_user), :visible => false)
     get :view, :display_name => users(:normal_user).display_name, :id => diary_entry_deleted.id
     assert_response :not_found
 
     # Try an entry by a suspended user
-    diary_entry_suspended = create(:diary_entry, :user_id => users(:suspended_user).id)
+    diary_entry_suspended = create(:diary_entry, :user => users(:suspended_user))
     get :view, :display_name => users(:suspended_user).display_name, :id => diary_entry_suspended.id
     assert_response :not_found
 
     # Try an entry by a deleted user
-    diary_entry_deleted = create(:diary_entry, :user_id => users(:deleted_user).id)
+    diary_entry_deleted = create(:diary_entry, :user => users(:deleted_user))
     get :view, :display_name => users(:deleted_user).display_name, :id => diary_entry_deleted.id
     assert_response :not_found
   end
@@ -575,8 +579,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Get a diary entry that has hidden comments
     diary_entry = create(:diary_entry)
     visible_comment = create(:diary_comment, :diary_entry => diary_entry)
-    suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:suspended_user).id)
-    deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:deleted_user).id)
+    suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => users(:suspended_user))
+    deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => users(:deleted_user))
     hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
 
     get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
@@ -611,7 +615,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_hidecomment
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
     diary_comment = create(:diary_comment, :diary_entry => diary_entry)
     # Try without logging in
     post :hidecomment, :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id
@@ -641,7 +645,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     end
 
     # Test a user with a comment
-    create(:diary_comment, :user_id => users(:public_user).id)
+    create(:diary_comment, :user => users(:public_user))
 
     get :comments, :display_name => users(:public_user).display_name
     assert_response :success
@@ -659,62 +663,47 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :not_found
   end
 
-  ##
-  # test subscribe success
   def test_subscribe_success
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
-
-    #basic_authorization(users(:public_user).email, "test")
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
 
     assert_difference "diary_entry.subscribers.count", 1 do
-      post :subscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
+      post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     end
     assert_response :redirect
   end
 
-  ##
-  # test subscribe fail
   def test_subscribe_fail
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
 
     # not signed in
-    assert_no_difference "diary_entry.subscribers.count", 1 do
+    assert_no_difference "diary_entry.subscribers.count" do
       post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
     end
     assert_response :forbidden
 
     # bad diary id
-    post :subscribe, {:id => 999111, :display_name => "username"}, { :user => users(:public_user).id}
+    post :subscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }
     assert_response :not_found
 
     # trying to subscribe when already subscribed
-    post :subscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
+    post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     assert_no_difference "diary_entry.subscribers.count" do
-      post :subscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
+      post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     end
   end
 
-  ##
-  # test unsubscribe success
   def test_unsubscribe_success
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
 
+    post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     assert_difference "diary_entry.subscribers.count", -1 do
-      post :unsubscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:normal_user).id}
-    end
-    assert_response :redirect
-
-    post :subscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
-    assert_difference "diary_entry.subscribers.count", -1 do
-      post :unsubscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
+      post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     end
     assert_response :redirect
   end
 
-  ##
-  # test unsubscribe fail
   def test_unsubscribe_fail
-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    diary_entry = create(:diary_entry, :user => users(:normal_user))
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do
@@ -723,12 +712,12 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :forbidden
 
     # bad diary id
-    post :unsubscribe, {:id => 999111, :display_name => "username"}, { :user => users(:public_user).id}
+    post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }
     assert_response :not_found
 
-    # trying to subscribe when already subscribed
+    # trying to unsubscribe when not subscribed
     assert_no_difference "diary_entry.subscribers.count" do
-      post :unsubscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
+      post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     end
   end