Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 10 insertions, 8 deletions

diff --git a/test/factories/users.rb b/test/factories/users.rb
index 3d53141..a84b41d 100644
--- a/test/factories/users.rb
+++ b/test/factories/users.rb
@@ -1,11 +1,13 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :user do |f|
-  f.sequence(:user_name) { |n| "User #{n}" }
-  f.sequence(:first_name) { |n| "John #{n}" }
-  f.sequence(:last_name) { |n| "Smith #{n}" }
-  f.sequence(:email) { |n| "john.smith#{n}@company.com" }
-  f.sequence(:password) { |n| "Testpassword#{n}" }
-  f.sequence(:password_confirmation) { |n| "Testpassword#{n}" }
-  f.association :language
+FactoryGirl.define do 
+	factory :user do
+    sequence(:user_name) { |n| "User #{n}" }
+    sequence(:first_name) { |n| "John #{n}" }
+    sequence(:last_name) { |n| "Smith #{n}" }
+    sequence(:email) { |n| "john.smith#{n}@company.com" }
+    sequence(:password) { |n| "Testpassword#{n}" }
+    sequence(:password_confirmation) { |n| "Testpassword#{n}" }
+    association :language
+  end
 end
\ No newline at end of file