Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 6 insertions, 4 deletions

diff --git a/test/factories/phone_numbers.rb b/test/factories/phone_numbers.rb
index 74b43cc..3b25938 100644
--- a/test/factories/phone_numbers.rb
+++ b/test/factories/phone_numbers.rb
@@ -1,7 +1,9 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :phone_number do |f|
-  f.sequence(:name) { |n| "Name #{n}" }
-  f.sequence(:number) { |n| "(0)30 227 #{n}" }
-  f.association :phone_numberable, :factory => :phone_book_entry 
+FactoryGirl.define do
+  factory :phone_number do
+    sequence(:name) { |n| "Name #{n}" }
+    sequence(:number) { |n| "(0)30 227 #{n}" }
+    association :phone_numberable, :factory => :phone_book_entry 
+  end
 end
\ No newline at end of file