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

1 files changed, 7 insertions, 5 deletions

diff --git a/test/factories/gemeinschaft_setups.rb b/test/factories/gemeinschaft_setups.rb
index ed69bc3..a2c0f72 100644
--- a/test/factories/gemeinschaft_setups.rb
+++ b/test/factories/gemeinschaft_setups.rb
@@ -1,8 +1,10 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :gemeinschaft_setup do |f|
-  f.association :user
-  f.association :sip_domain
-  f.association :country
-  f.association :language
+FactoryGirl.define do
+  factory :gemeinschaft_setup do
+    association :user
+    association :sip_domain
+    association :country
+    association :language
+  end
 end
\ No newline at end of file