From bfe760a4b0372188f4964914bbc8e5bed31363ba Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 5 Oct 2016 13:18:45 +0100 Subject: [PATCH] Replace friends fixture with a factory --- test/controllers/changeset_controller_test.rb | 2 +- test/controllers/diary_entry_controller_test.rb | 5 +++-- test/controllers/user_controller_test.rb | 4 +++- test/factories/friends.rb | 7 +++++++ test/fixtures/friends.yml | 4 ---- test/models/friend_test.rb | 2 +- test/models/user_test.rb | 12 +++++------- 7 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 test/factories/friends.rb delete mode 100644 test/fixtures/friends.yml diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb index e1960d4e8..c996bbaab 100644 --- a/test/controllers/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -3,7 +3,7 @@ require "changeset_controller" class ChangesetControllerTest < ActionController::TestCase api_fixtures - fixtures :friends, :changeset_comments, :changesets_subscribers + fixtures :changeset_comments, :changesets_subscribers ## # test all routes which lead to this controller diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index 6e07a4091..813b50b2f 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 @@ -419,7 +419,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 diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb index ede841032..6a5fca785 100644 --- a/test/controllers/user_controller_test.rb +++ b/test/controllers/user_controller_test.rb @@ -2,7 +2,7 @@ require "test_helper" class UserControllerTest < ActionController::TestCase api_fixtures - fixtures :messages, :friends + fixtures :messages ## # test all routes which lead to this controller @@ -1191,6 +1191,7 @@ class UserControllerTest < ActionController::TestCase # Get users to work with user = users(:normal_user) friend = users(:public_user) + create(:friend, :user_id => user.id, :friend_user_id => friend.id) # Check that the users are friends assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first @@ -1231,6 +1232,7 @@ class UserControllerTest < ActionController::TestCase # Get users to work with user = users(:normal_user) friend = users(:public_user) + create(:friend, :user_id => user.id, :friend_user_id => friend.id) # Check that the users are friends assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first diff --git a/test/factories/friends.rb b/test/factories/friends.rb new file mode 100644 index 000000000..46b14a39d --- /dev/null +++ b/test/factories/friends.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do + factory :friend do + # Fixme requires User Factory + user_id 1 + friend_user_id 2 + end +end diff --git a/test/fixtures/friends.yml b/test/fixtures/friends.yml deleted file mode 100644 index 782f1e3d2..000000000 --- a/test/fixtures/friends.yml +++ /dev/null @@ -1,4 +0,0 @@ -normal_user_with_second_user: - id: 1 - user_id: 1 - friend_user_id: 2 diff --git a/test/models/friend_test.rb b/test/models/friend_test.rb index a13f67470..08eeeeb17 100644 --- a/test/models/friend_test.rb +++ b/test/models/friend_test.rb @@ -2,9 +2,9 @@ require "test_helper" class FriendTest < ActiveSupport::TestCase api_fixtures - fixtures :friends def test_friend_count + create(:friend) assert_equal 1, Friend.count end end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index f9d94cc17..5de5db326 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -5,7 +5,7 @@ class UserTest < ActiveSupport::TestCase include Rails::Dom::Testing::Assertions::SelectorAssertions api_fixtures - fixtures :friends, :languages, :user_roles + fixtures :languages, :user_roles def test_invalid_with_empty_attributes user = User.new @@ -106,6 +106,7 @@ class UserTest < ActiveSupport::TestCase end def test_friend_with + create(:friend, :user_id => users(:normal_user).id, :friend_user_id => users(:public_user).id) assert users(:normal_user).is_friends_with?(users(:public_user)) assert !users(:normal_user).is_friends_with?(users(:inactive_user)) assert !users(:public_user).is_friends_with?(users(:normal_user)) @@ -129,14 +130,11 @@ class UserTest < ActiveSupport::TestCase def test_friends_with # normal user is a friend of second user - # it should be a one way friend accossitation - assert_equal 1, Friend.count + # it should be a one way friend associatation norm = users(:normal_user) sec = users(:public_user) - # friend = Friend.new - # friend.befriender = norm - # friend.befriendee = sec - # friend.save + create(:friend, :user_id => norm.id, :friend_user_id => sec.id) + assert_equal 1, Friend.count assert_equal [sec], norm.friend_users assert_equal 1, norm.friend_users.size assert_equal 1, Friend.count -- 2.39.5