diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
| commit | af79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch) | |
| tree | fd6c4dab5dc56fed5f616ddec20e1f82780f20fe /test/factories/conference_invitees.rb | |
| parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
| parent | 9f14a9a6573db607b79124524088803812454515 (diff) | |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'test/factories/conference_invitees.rb')
| -rw-r--r-- | test/factories/conference_invitees.rb | 12 |
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 |