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

1 files changed, 7 insertions, 5 deletions

diff --git a/test/factories/conference_invitees.rb b/test/factories/conference_invitees.rb
index 4e1eb68..54fa53a 100644
--- a/test/factories/conference_invitees.rb
+++ b/test/factories/conference_invitees.rb
@@ -1,8 +1,10 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :conference_invitee do |f|
-  f.phone_number { Factory.build(:phone_number) }
-  f.association :conference
-  f.speaker true
-  f.moderator false
+FactoryGirl.define do
+  factory :conference_invitee do
+    phone_number { FactoryGirl.build(:phone_number) }
+    association :conference
+    speaker true
+    moderator false
+  end
 end
\ No newline at end of file