aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@envy8.local>2008-04-27 17:16:05 -0500
committerDavid Heinemeier Hansson <david@envy8.local>2008-04-27 17:16:05 -0500
commit027f0f822f418aba41f1d52f9d5895e34fae0310 (patch)
tree91b50adfff2f836ccb49e3fdfda082f31cceaf94 /activerecord/test/fixtures
parent162c7c1908946cfb48c201cfc5a4976a33c8bff1 (diff)
parent7f4171da5e3ed5b3e038b95f8f5ae05ba6e21bef (diff)
downloadrails-027f0f822f418aba41f1d52f9d5895e34fae0310.tar.gz
rails-027f0f822f418aba41f1d52f9d5895e34fae0310.tar.bz2
rails-027f0f822f418aba41f1d52f9d5895e34fae0310.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r--activerecord/test/fixtures/jobs.yml7
-rw-r--r--activerecord/test/fixtures/references.yml17
2 files changed, 24 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/jobs.yml b/activerecord/test/fixtures/jobs.yml
new file mode 100644
index 0000000000..f5775d27d3
--- /dev/null
+++ b/activerecord/test/fixtures/jobs.yml
@@ -0,0 +1,7 @@
+unicyclist:
+ id: 1
+ ideal_reference_id: 2
+clown:
+ id: 2
+magician:
+ id: 3
diff --git a/activerecord/test/fixtures/references.yml b/activerecord/test/fixtures/references.yml
new file mode 100644
index 0000000000..8e3953e916
--- /dev/null
+++ b/activerecord/test/fixtures/references.yml
@@ -0,0 +1,17 @@
+michael_magician:
+ id: 1
+ person_id: 1
+ job_id: 3
+ favourite: false
+
+michael_unicyclist:
+ id: 2
+ person_id: 1
+ job_id: 1
+ favourite: true
+
+david_unicyclist:
+ id: 3
+ person_id: 2
+ job_id: 1
+ favourite: false