Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 5 insertions, 3 deletions

diff --git a/test/factories/manufacturers.rb b/test/factories/manufacturers.rb
index f091dd2..e211fc6 100644
--- a/test/factories/manufacturers.rb
+++ b/test/factories/manufacturers.rb
@@ -1,6 +1,8 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :manufacturer do |f|
-  f.sequence(:name) { |n| "#{n}. manufacturer" }
-  f.sequence(:ieee_name) { |n| "#{n}. ieee" }
+FactoryGirl.define do
+  factory :manufacturer do
+    sequence(:name) { |n| "#{n}. manufacturer" }
+    sequence(:ieee_name) { |n| "#{n}. ieee" }
+  end
 end
\ No newline at end of file