diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
| commit | af79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch) | |
| tree | fd6c4dab5dc56fed5f616ddec20e1f82780f20fe /test/functional/phone_book_entries_controller_test.rb | |
| parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
| parent | 9f14a9a6573db607b79124524088803812454515 (diff) | |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
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 ) |