Merged updates from trunk into stable branch

[feedcatcher.git] / test / fixtures / feed_items.yml

diff --git a/test/fixtures/feed_items.yml b/test/fixtures/feed_items.yml
index 480ee1fc55907e1b35383a3b313328ed46b260a9..1b88e15fb67b72450c96344a19a8fe73287f5076 100644 (file)
--- a/test/fixtures/feed_items.yml
+++ b/test/fixtures/feed_items.yml
@@ -1,11 +1,27 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-one:
-  feed_name: MyString
-  title: MyString
-  description: MyText
-
-two:
-  feed_name: MyString
-  title: MyString
-  description: MyText
+feed_one_item_one:
+    feed_name: feed_one
+    title: feed one item one
+    description: feed one item one description
+
+feed_one_item_two:
+    feed_name: feed_one
+    title: feed one item two
+    description: feed one item two description
+
+feed_one_item_three:
+    feed_name: feed_one
+    title: feed one item three
+    description: feed one item three description
+
+feed_two_item_one:
+    feed_name: feed_two
+    title: feed two item one
+    description: feed two item one description
+
+feed_two_item_two:
+    feed_name: feed_two
+    title: feed two item two
+    description: feed two item two description
+