diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
| commit | 248391a7e11e9fa5ffe312cb380034691430acc5 (patch) | |
| tree | 0d151f54139732c417f3d4242e13f1aac64ac858 /activerecord/test/fixtures | |
| parent | 86abd6887dac9ee233740399f9e5758309af512e (diff) | |
| parent | a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763 (diff) | |
| download | rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.gz rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.bz2 rails-248391a7e11e9fa5ffe312cb380034691430acc5.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/test/fixtures')
| -rw-r--r-- | activerecord/test/fixtures/member_types.yml | 6 | ||||
| -rw-r--r-- | activerecord/test/fixtures/members.yml | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/member_types.yml b/activerecord/test/fixtures/member_types.yml new file mode 100644 index 0000000000..797a57430c --- /dev/null +++ b/activerecord/test/fixtures/member_types.yml @@ -0,0 +1,6 @@ +founding: + id: 1 + name: Founding +provisional: + id: 2 + name: Provisional diff --git a/activerecord/test/fixtures/members.yml b/activerecord/test/fixtures/members.yml index 67a6cc459a..6db945e61d 100644 --- a/activerecord/test/fixtures/members.yml +++ b/activerecord/test/fixtures/members.yml @@ -1,4 +1,6 @@ groucho: name: Groucho Marx + member_type_id: 1 some_other_guy: - name: Englebert Humperdink
\ No newline at end of file + name: Englebert Humperdink + member_type_id: 2 |