diff options
| author | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
| commit | aed84444142604a62e37e57acfaaf957219e2c8d (patch) | |
| tree | e00b1f5844590393171e0bc839ab516d39f5144d /test/functional/phone_book_entries_controller_test.rb | |
| parent | c24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff) | |
| parent | 12c8f4c82770ded6ea6b519e4451ed6757419ddf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'test/functional/phone_book_entries_controller_test.rb')
| -rw-r--r-- | test/functional/phone_book_entries_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/phone_book_entries_controller_test.rb b/test/functional/phone_book_entries_controller_test.rb index 81c5b61..b340f0f 100644 --- a/test/functional/phone_book_entries_controller_test.rb +++ b/test/functional/phone_book_entries_controller_test.rb @@ -3,9 +3,9 @@ require 'test_helper' class PhoneBookEntriesControllerTest < ActionController::TestCase setup do - @user1 = Factory.create(:user) + @user1 = FactoryGirl.create(:user) pb = @user1.phone_books.first - @user1_phone_book_entry = Factory.create( + @user1_phone_book_entry = FactoryGirl.create( :phone_book_entry, :phone_book_id => pb.id ) |