X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6b7ebf6dc40da609267ad38df981cd31d99e1538..23c79ba2a39288dc69fff7b0587004545c40e941:/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 f36de9ad5..d926f2656 100644 --- 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 @@ -440,7 +440,8 @@ 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 @@ -675,7 +676,7 @@ class DiaryEntryControllerTest < ActionController::TestCase diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) # 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