Use stub_any_instance in order to stub find results.

[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 d926f26569e1781ff12f96a9fb91ffdf9c83f8d4..6e766460ee97770d1e261b0027c57d88f135036b 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -1,10 +1,15 @@
 require "test_helper"
 
 class DiaryEntryControllerTest < ActionController::TestCase
 require "test_helper"
 
 class DiaryEntryControllerTest < ActionController::TestCase

-  fixtures :users, :user_roles, :languages
+  fixtures :users, :user_roles

 
   include ActionView::Helpers::NumberHelper
 
 
   include ActionView::Helpers::NumberHelper
 

+  def setup
+    # Create the default language for diary entries
+    create(:language, :code => "en")
+  end
+

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -162,6 +167,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_equal new_language_code, UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v
 
     new_language_code = "de"
     assert_equal new_language_code, UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v
 
     new_language_code = "de"

+    create(:language, :code => new_language_code)

 
     # Now try creating a diary entry in a different language
     assert_difference "DiaryEntry.count", 1 do
 
     # Now try creating a diary entry in a different language
     assert_difference "DiaryEntry.count", 1 do


@@ -213,7 +219,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_edit
   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
 
     # 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 +323,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_comment
   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
 
     # Make sure that you are denied when you are not logged in
     post :comment, :display_name => entry.user.display_name, :id => entry.id


@@ -377,7 +383,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   def test_comment_spammy
     # Find the entry to comment on
 
   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
     post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id }
 
     # Generate some spammy content


@@ -417,7 +423,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)
   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
 
     # Try a list of all diary entries
     get :list


@@ -425,9 +431,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_user
   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
 
     # Try a list of diary entries for a valid user
     get :list, :display_name => users(:normal_user).display_name


@@ -440,9 +446,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_friends
   end
 
   def test_list_friends

-    friend = create(:friend, :user_id => users(:normal_user).id)
-    diary_entry = create(:diary_entry, :user_id => friend.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
 
     # Try a list of diary entries for your friends when not logged in
     get :list, :friends => true


@@ -457,7 +463,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_nearby
   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
 
     # Try a list of diary entries for nearby users when not logged in
     get :list, :nearby => true


@@ -472,6 +478,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_language
   end
 
   def test_list_language

+    create(:language, :code => "de")
+    create(:language, :code => "sl")

     diary_entry_en = create(:diary_entry, :language_code => "en")
     diary_entry_en2 = create(:diary_entry, :language_code => "en")
     diary_entry_de = create(:diary_entry, :language_code => "de")
     diary_entry_en = create(:diary_entry, :language_code => "en")
     diary_entry_en2 = create(:diary_entry, :language_code => "en")
     diary_entry_de = create(:diary_entry, :language_code => "de")


@@ -490,6 +498,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_rss
   end
 
   def test_rss

+    create(:language, :code => "de")

     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")


@@ -506,6 +515,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_rss_language
   end
 
   def test_rss_language

+    create(:language, :code => "de")

     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")


@@ -521,6 +531,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   #  end
 
   def test_rss_language_with_no_entries
   #  end
 
   def test_rss_language_with_no_entries

+    create(:language, :code => "sl")

     create(:diary_entry, :language_code => "en")
 
     get :rss, :language => "sl", :format => :rss
     create(:diary_entry, :language_code => "en")
 
     get :rss, :language => "sl", :format => :rss


@@ -529,9 +540,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_rss_user
   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"
 
     get :rss, :display_name => users(:normal_user).display_name, :format => :rss
     assert_response :success, "Should be able to get a specific users diary RSS"


@@ -554,23 +565,23 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   def test_view
     # Try a normal entry that should work
 
   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
     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
     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
     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
     get :view, :display_name => users(:deleted_user).display_name, :id => diary_entry_deleted.id
     assert_response :not_found
   end


@@ -579,8 +590,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)
     # 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
     hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
 
     get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id


@@ -615,7 +626,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_hidecomment
   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
     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


@@ -645,7 +656,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     end
 
     # Test a user with a comment
     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
 
     get :comments, :display_name => users(:public_user).display_name
     assert_response :success


@@ -664,7 +675,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_subscribe_success
   end
 
   def test_subscribe_success

-    diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+    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 }
 
     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 }


@@ -673,7 +684,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_subscribe_fail
   end
 
   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" do
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do


@@ -693,7 +704,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_unsubscribe_success
   end
 
   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 :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


@@ -703,7 +714,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_unsubscribe_fail
   end
 
   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
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do