Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 7 insertions, 5 deletions

diff --git a/test/factories/countries.rb b/test/factories/countries.rb
index cc3fc88..99caab5 100644
--- a/test/factories/countries.rb
+++ b/test/factories/countries.rb
@@ -1,8 +1,10 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :country do |f|
-  f.sequence(:name) { |n| "Country #{n}" }
-  f.sequence(:country_code) { |n| "#{n}" }
-  f.sequence(:international_call_prefix) { |n| "#{n}" }
-  f.sequence(:trunk_prefix) { |n| "#{n}" }
+FactoryGirl.define do
+  factory :country do
+    sequence(:name) { |n| "Country #{n}" }
+    sequence(:country_code) { |n| "#{n}" }
+    sequence(:international_call_prefix) { |n| "#{n}" }
+    sequence(:trunk_prefix) { |n| "#{n}" }
+  end
 end
\ No newline at end of file