Replace changeset_comments 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 7a92e52898a9928a12470b6c1448e714314bc2ec..813b50b2f3be35fb35d2dccecabde2ca15c21fdb 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
 
@@ -404,8 +404,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_user
-    diary_entry = create(:diary_entry)
-    geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
+    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)
 
     # Try a list of diary entries for a valid user
     get :list, :display_name => users(:normal_user).display_name
@@ -418,7 +419,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)
+    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)
 
     # Try a list of diary entries for your friends when not logged in
     get :list, :friends => true
@@ -434,6 +437,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   def test_list_nearby
     diary_entry = create(:diary_entry, :user_id => users(:public_user).id)
+
     # Try a list of diary entries for nearby users when not logged in
     get :list, :nearby => true
     assert_response :redirect