Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 6 insertions, 4 deletions

diff --git a/test/factories/area_codes.rb b/test/factories/area_codes.rb
index 87b2271..3ed894d 100644
--- a/test/factories/area_codes.rb
+++ b/test/factories/area_codes.rb
@@ -1,7 +1,9 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :area_code do |f|
-  f.sequence(:name) { |n| "AreaCode #{n}" }
-  f.sequence(:area_code) { |n| "#{n}" }
-  f.association :country
+FactoryGirl.define do
+	factory :area_code do
+    sequence(:name) { |n| "AreaCode #{n}" }
+    sequence(:area_code) { |n| "#{n}" }
+    association :country
+  end
 end
\ No newline at end of file