diff options
| author | Rolf Timmermans <r.timmermans@voormedia.com> | 2011-03-27 17:18:32 +0200 |
|---|---|---|
| committer | Rolf Timmermans <r.timmermans@voormedia.com> | 2011-03-27 17:18:32 +0200 |
| commit | 512057d386075f207d8927a5e0ce3943174d5c78 (patch) | |
| tree | c0b9122469af1e4af74142cc2cad6d560226753c /activerecord/test/fixtures/posts.yml | |
| parent | d89a7967b5af5c87bbfc268af72287b82541d384 (diff) | |
| parent | a9d27c04abf24dc85be061ff9772d71897af02b1 (diff) | |
| download | rails-512057d386075f207d8927a5e0ce3943174d5c78.tar.gz rails-512057d386075f207d8927a5e0ce3943174d5c78.tar.bz2 rails-512057d386075f207d8927a5e0ce3943174d5c78.zip | |
Merge remote-tracking branch 'upstream/master' into desc_tracker
Diffstat (limited to 'activerecord/test/fixtures/posts.yml')
| -rw-r--r-- | activerecord/test/fixtures/posts.yml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/posts.yml b/activerecord/test/fixtures/posts.yml index 07069a064f..7298096025 100644 --- a/activerecord/test/fixtures/posts.yml +++ b/activerecord/test/fixtures/posts.yml @@ -52,3 +52,31 @@ eager_other: title: eager loading with OR'd conditions body: hello type: Post + +misc_by_bob: + id: 8 + author_id: 3 + title: misc post by bob + body: hello + type: Post + +misc_by_mary: + id: 9 + author_id: 2 + title: misc post by mary + body: hello + type: Post + +other_by_bob: + id: 10 + author_id: 3 + title: other post by bob + body: hello + type: Post + +other_by_mary: + id: 11 + author_id: 2 + title: other post by mary + body: hello + type: Post |