Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 12 insertions, 10 deletions

diff --git a/test/factories/user_group_memberships.rb b/test/factories/user_group_memberships.rb
index 7904f2f..8dc74f0 100644
--- a/test/factories/user_group_memberships.rb
+++ b/test/factories/user_group_memberships.rb
@@ -1,14 +1,16 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :user_group_membership do |f|
-  f.association :user_group
-  f.association :user
-  
-  # Make sure that the User is a member of the Tenant.
-  f.after_build do |instance|
-    Factory.create(:tenant_membership,
-      :tenant_id => instance.user_group.tenant.id,
-      :user_id   => instance.user.id
-    )
+FactoryGirl.define do
+  factory :user_group_membership do |f|
+    f.association :user_group
+    f.association :user
+    
+    # Make sure that the User is a member of the Tenant.
+    f.after_build do |instance|
+      FactoryGirl.create(:tenant_membership,
+        :tenant_id => instance.user_group.tenant.id,
+        :user_id   => instance.user.id
+      )
+    end
   end
 end
\ No newline at end of file