Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 5 insertions, 3 deletions

diff --git a/test/factories/phone_books.rb b/test/factories/phone_books.rb
index 4aa8d07..80e2a06 100644
--- a/test/factories/phone_books.rb
+++ b/test/factories/phone_books.rb
@@ -1,6 +1,8 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :phone_book do |f|
-  f.sequence(:name) { |n| "Phone book #{n}" }
-  f.association :phone_bookable, :factory => :user 
+FactoryGirl.define do
+  factory :phone_book do
+    sequence(:name) { |n| "Phone book #{n}" }
+    association :phone_bookable, :factory => :user 
+  end
 end