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/user_groups.rb | |
| parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
| parent | 9f14a9a6573db607b79124524088803812454515 (diff) | |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'test/factories/user_groups.rb')
| -rw-r--r-- | test/factories/user_groups.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/factories/user_groups.rb b/test/factories/user_groups.rb index 9a448ec..c777d95 100644 --- a/test/factories/user_groups.rb +++ b/test/factories/user_groups.rb @@ -1,6 +1,8 @@ # Read about factories at http://github.com/thoughtbot/factory_girl -Factory.define :user_group do |f| - f.sequence(:name) { |n| "UserGroup #{n}" } - f.association :tenant +FactoryGirl.define do + factory :user_group do + sequence(:name) { |n| "UserGroup #{n}" } + association :tenant + end end
\ No newline at end of file |