Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 6 insertions, 5 deletions

diff --git a/test/factories/tenants.rb b/test/factories/tenants.rb
index 9a62e93..fc85e88 100644
--- a/test/factories/tenants.rb
+++ b/test/factories/tenants.rb
@@ -1,8 +1,9 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :tenant do |f|
-  f.sequence(:name) { |n| "Tenant #{n}" }
-  f.association :country
-  f.association :language
-#  f.association :sip_domain
+FactoryGirl.define do
+  factory :tenant do
+    sequence(:name) { |n| "Tenant #{n}" }
+    association :country
+    association :language
+  end
 end