8 files changed, 17 insertions, 8 deletions
diff --git a/activerecord/test/fixtures/books.yml b/activerecord/test/fixtures/books.yml
index fb48645456..abe56752c6 100644
--- a/activerecord/test/fixtures/books.yml
+++ b/activerecord/test/fixtures/books.yml
@@ -2,8 +2,10 @@ awdr:
   author_id: 1
   id: 1
   name: "Agile Web Development with Rails"
+  format: "paperback"
 
 rfr:
   author_id: 1
   id: 2
   name: "Ruby for Rails"
+  format: "ebook"
diff --git a/activerecord/test/fixtures/computers.yml b/activerecord/test/fixtures/computers.yml
index daf969d7da..7281a4d768 100644
--- a/activerecord/test/fixtures/computers.yml
+++ b/activerecord/test/fixtures/computers.yml
@@ -1,4 +1,5 @@
 workstation:
   id: 1
+  system: 'Linux'
   developer: 1
   extendedWarranty: 1
diff --git a/activerecord/test/fixtures/fk_test_has_pk.yml b/activerecord/test/fixtures/fk_test_has_pk.yml
index c93952180b..73882bac41 100644
--- a/activerecord/test/fixtures/fk_test_has_pk.yml
+++ b/activerecord/test/fixtures/fk_test_has_pk.yml
@@ -1,2 +1,2 @@
 first:
-  id: 1
-\ No newline at end of file
+  pk_id: 1
+\ No newline at end of file
diff --git a/activerecord/test/fixtures/pirates.yml b/activerecord/test/fixtures/pirates.yml
index 6004f390a4..1bb3bf0051 100644
--- a/activerecord/test/fixtures/pirates.yml
+++ b/activerecord/test/fixtures/pirates.yml
@@ -7,3 +7,6 @@ redbeard:
   parrot: louis
   created_on: "<%= 2.weeks.ago.to_s(:db) %>"
   updated_on: "<%= 2.weeks.ago.to_s(:db) %>"
+
+mark:
+  catchphrase: "X $LABELs the spot!"
diff --git a/activerecord/test/fixtures/posts.yml b/activerecord/test/fixtures/posts.yml
index 7298096025..86d46f753a 100644
--- a/activerecord/test/fixtures/posts.yml
+++ b/activerecord/test/fixtures/posts.yml
@@ -4,7 +4,6 @@ welcome:
   title: Welcome to the weblog
   body: Such a lovely day
   comments_count: 2
-  taggings_count: 1
   tags_count: 1
   type: Post
 
@@ -14,7 +13,6 @@ thinking:
   title: So I was thinking
   body: Like I hopefully always am
   comments_count: 1
-  taggings_count: 1
   tags_count: 1
   type: SpecialPost
 
diff --git a/activerecord/test/fixtures/topics.yml b/activerecord/test/fixtures/topics.yml
index bf049abbf1..4c98b10380 100644
--- a/activerecord/test/fixtures/topics.yml
+++ b/activerecord/test/fixtures/topics.yml
@@ -6,7 +6,7 @@ first:
   written_on: 2003-07-16t15:28:11.2233+01:00
   last_read: 2004-04-15
   bonus_time: 2005-01-30t15:28:00.00+01:00
-  content: Have a nice day
+  content: "--- Have a nice day\n...\n"
   approved: false
   replies_count: 1
 
@@ -15,7 +15,7 @@ second:
   title: The Second Topic of the day
   author_name: Mary
   written_on: 2004-07-15t15:28:00.0099+01:00
-  content: Have a nice day
+  content: "--- Have a nice day\n...\n"
   approved: true
   replies_count: 0
   parent_id: 1
@@ -26,7 +26,7 @@ third:
   title: The Third Topic of the day
   author_name: Carl
   written_on: 2012-08-12t20:24:22.129346+00:00
-  content: I'm a troll
+  content: "--- I'm a troll\n...\n"
   approved: true
   replies_count: 1
 
@@ -35,7 +35,7 @@ fourth:
   title: The Fourth Topic of the day
   author_name: Carl
   written_on: 2006-07-15t15:28:00.0099+01:00
-  content: Why not?
+  content: "--- Why not?\n...\n"
   approved: true
   type: Reply
   parent_id: 3
@@ -45,5 +45,5 @@ fifth:
   title: The Fifth Topic of the day
   author_name: Jason
   written_on: 2013-07-13t12:11:00.0099+01:00
-  content: Omakase
+  content: "--- Omakase\n...\n"
   approved: true
diff --git a/activerecord/test/fixtures/uuid_children.yml b/activerecord/test/fixtures/uuid_children.yml
new file mode 100644
index 0000000000..a7b15016e2
--- /dev/null
+++ b/activerecord/test/fixtures/uuid_children.yml
@@ -0,0 +1,3 @@
+sonny:
+  uuid_parent: daddy
+  name: Sonny
diff --git a/activerecord/test/fixtures/uuid_parents.yml b/activerecord/test/fixtures/uuid_parents.yml
new file mode 100644
index 0000000000..0b40225c5c
--- /dev/null
+++ b/activerecord/test/fixtures/uuid_parents.yml
@@ -0,0 +1,2 @@
+daddy:
+  name: Daddy