Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 5 insertions, 3 deletions

diff --git a/test/factories/phone_models.rb b/test/factories/phone_models.rb
index 8e6a50f..28b8802 100644
--- a/test/factories/phone_models.rb
+++ b/test/factories/phone_models.rb
@@ -1,6 +1,8 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :phone_model do |f|
-  f.sequence(:name) { |n| "Phone Model #{n}" }
-  f.association :manufacturer
+FactoryGirl.define do
+  factory :phone_model do
+    sequence(:name) { |n| "Phone Model #{n}" }
+    association :manufacturer
+  end
 end