Merge r17285 from the oauth branch - allow flash access to set headers, even when...

[rails.git] / test / fixtures / relations.yml

diff --git a/test/fixtures/relations.yml b/test/fixtures/relations.yml
index cf1d1ff5600718b5db43998900a1d51a8823d62d..3ec80ecaee7613248d236f1534a3202e52640113 100644 (file)
--- a/test/fixtures/relations.yml
+++ b/test/fixtures/relations.yml
@@ -1,20 +1,41 @@
 visible_relation:
   id: 1
 visible_relation:
   id: 1

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   timestamp: 2007-01-01 00:00:00

-  visible: 1
+  visible: true

   version: 1
 
 invisible_relation:
   id: 2
   version: 1
 
 invisible_relation:
   id: 2

-  user_id: 1
+  changeset_id: 3

   timestamp: 2007-01-01 00:00:00
   timestamp: 2007-01-01 00:00:00

-  visible: 0
+  visible: false

   version: 1
 
 used_relation:
   id: 3
   version: 1
 
 used_relation:
   id: 3

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   timestamp: 2007-01-01 00:00:00

-  visible: 1
+  visible: true
+  version: 1
+  
+multi_tag_relation:
+  id: 4
+  changeset_id: 4
+  timestamp: 2009-04-21 09:50:57
+  visible: true
+  version: 1
+  
+public_used_relation:
+  id: 5
+  changeset_id: 2
+  timestamp: 2009-04-22 00:30:03
+  visible: true
+  version: 1
+  
+public_visible_relation:
+  id: 6
+  changeset_id: 2
+  timestamp: 2009-04-22 00:34:12
+  visible: true

   version: 1
   version: 1