Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 12 insertions, 10 deletions

diff --git a/test/factories/phones.rb b/test/factories/phones.rb
index 646d548..af0b37a 100644
--- a/test/factories/phones.rb
+++ b/test/factories/phones.rb
@@ -1,15 +1,17 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :phone do |f|
-  f.sequence(:mac_address) { |n| ('%06d' % n).to_s + ('%06d' % n).to_s }
-  f.association :phone_model
-  f.association :phoneable, :factory => :tenant 
+FactoryGirl.define do
+  factory :phone do |f|
+    f.sequence(:mac_address) { |n| ('%06d' % n).to_s + ('%06d' % n).to_s }
+    f.association :phone_model
+    f.association :phoneable, :factory => :tenant 
 
-  # We have to make sure that the OUI is created as well.  
-  f.after_build do |instance|
-    Factory.create(:oui,
-      :manufacturer => instance.phone_model.manufacturer,
-      :value        => instance.mac_address.slice(0, 6)
-    )
+    # We have to make sure that the OUI is created as well.  
+    f.after_build do |instance|
+      FactoryGirl.create(:oui,
+        :manufacturer => instance.phone_model.manufacturer,
+        :value        => instance.mac_address.slice(0, 6)
+      )
+    end
   end
 end
\ No newline at end of file