diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 12:50:56 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 12:50:56 -0800 |
| commit | 9fe42232f14eb44f06c655e87b54ff30cee0fe44 (patch) | |
| tree | 2a9fa606752099a0f1cc9a27f77d08d9a0a634a0 /activerecord/test/fixtures | |
| parent | a76af2309ac362ae1f38d24fd4746139deca3417 (diff) | |
| parent | c23fbd0d475612fe9cd493bd08c8da2f8d7e6f03 (diff) | |
| download | rails-9fe42232f14eb44f06c655e87b54ff30cee0fe44.tar.gz rails-9fe42232f14eb44f06c655e87b54ff30cee0fe44.tar.bz2 rails-9fe42232f14eb44f06c655e87b54ff30cee0fe44.zip | |
Merge commit 'Fingertips/master'
Diffstat (limited to 'activerecord/test/fixtures')
| -rw-r--r-- | activerecord/test/fixtures/faces.yml | 4 | ||||
| -rw-r--r-- | activerecord/test/fixtures/interests.yml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/faces.yml b/activerecord/test/fixtures/faces.yml index 1dd2907cf7..c8e4a34484 100644 --- a/activerecord/test/fixtures/faces.yml +++ b/activerecord/test/fixtures/faces.yml @@ -5,3 +5,7 @@ trusting: weather_beaten: description: weather beaten man: steve + +confused: + description: confused + polymorphic_man: gordon (Man) diff --git a/activerecord/test/fixtures/interests.yml b/activerecord/test/fixtures/interests.yml index ec71890ab6..9200a19d5a 100644 --- a/activerecord/test/fixtures/interests.yml +++ b/activerecord/test/fixtures/interests.yml @@ -23,7 +23,11 @@ woodsmanship: zine: going_out man: steve -survial: +survival: topic: Survival zine: going_out man: steve + +llama_wrangling: + topic: Llama Wrangling + polymorphic_man: gordon (Man) |