typo 5.0.2 → 5.0.3.98

data/test/fixtures/categories.yml

@@ -1,35 +1,29 @@
 software:
-  id: 1
   name: Software
   permalink: software
   position: 1
 
 hardware:
-  id: 2
   name: Hardware
   permalink: hardware
   position: 2
 
 personal:
-  id: 3
   name: Personal
   permalink: personal
   position: 3
 
 lifeonmars:
-  id: 4
   name: Life On Mars
   permalink: life-on-mars
   position: 4
 
 strangelynamed:
-  id: 5
   name: "The Permalink doesn't match"
   permalink: weird-permalink
   position: 5
 
 xmltest:
-  id: 6
   name: "this & that"
   permalink: this-and-that
   position: 6

data/test/fixtures/categorizations.yml

@@ -1,31 +1,31 @@
 articles_categories1:
-  article_id: 1
-  category_id: 1
+  article: article1
+  category: software
 
 articles_categories2:
-  article_id: 1
-  category_id: 2
+  article: article1
+  category: hardware
 
 articles_categories3:
-  article_id: 1
-  category_id: 3
+  article: article1
+  category: personal
 
 articles_categories4:
-  article_id: 2 
-  category_id: 3
+  article: article2
+  category: personal
 
 articles_categories5:
-  article_id: 3
-  category_id: 3
-  
+  article: article3
+  category: personal
+
 articles_categories6:
-  article_id: 4
-  category_id: 3
+  article: article4
+  category: personal
 
 articles_categories7:
-  article_id: 1
-  category_id: 5
+  article: article1
+  category: strangelynamed
 
 articles_categories8:
-  article_id: 18
-  category_id: 6
+  article: xmltest
+  category: xmltest

data/test/fixtures/contents.yml

@@ -1,8 +1,6 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
 article1:
-  blog_id: 1
-  id: 1
   title: Article 1!
   body: body
   extended: extended content
@@ -12,17 +10,16 @@ article1:
   allow_comments: true
   allow_pings: true
   permalink: article-1
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: a87c4220-18d4-11da-aadd-0002a5d5c51b
   type: Article
   published: true
   state: published
+  tags: foo, bar
 
 article2:
   type: Article
-  blog_id: 1
-  id: 2
   title: Article 2!
   body: body
   extended: extended content
@@ -32,17 +29,16 @@ article2:
   allow_comments: true
   allow_pings: true
   permalink: article-2
-  user_id: 2
+  user: longbob
   author: Bob
   guid: bbbbb
   published: true
   state: published
+  tags: foo
 
 
 article3:
   type: Article
-  blog_id: 1
-  id: 3
   title: Article 3!
   body: body
   extended: extended content
@@ -52,7 +48,7 @@ article3:
   allow_comments: true
   allow_pings: true
   permalink: article-3
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: ccccc
   published: true
@@ -60,8 +56,6 @@ article3:
 
 article4:
   type: Article
-  blog_id: 1
-  id: 4
   title: Article 4!
   body: I'm not "public":http://www.example.com/public!
   published: false
@@ -72,57 +66,50 @@ article4:
   allow_comments: true
   allow_pings: true
   permalink: article-4
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: ddddd
+  tags: bar, bazz
 
 first_page:
   type: Page
-  blog_id: 1
-  id: 9
   name: page_one
   title: Page One Title
   body: ho ho ho
   created_at: 2005-05-05 01:00:00
   published_at: 2005-05-05 01:00:00
   updated_at: 2005-05-05 01:00:00
-  user_id: 1
+  user: tobi
   published: true
   state: published
 
 another_page:
   type: Page
-  blog_id: 1
-  id: 10
   name: page/two
   title: Another Page Title
   body: another body for yet another page
   updated_at: 2005-05-05 01:00:00
   created_at: 2005-05-05 01:00:00
   published_at: 2005-05-05 01:00:00
-  user_id: 1
+  user: tobi
   published: true
   state: published
 
 markdown_page:
   type: Page
-  blog_id: 1
-  id: 11
   name: markdown-page
   title: Markdown Page
-  text_filter_id: 1
+  text_filter: markdown_filter
   body: this is *markdown*.
   created_at: 2005-05-05 01:00:00
   updated_at: 2005-05-05 01:00:00
   published_at: 2005-05-05 01:00:00
-  user_id: 1
+  user: tobi
   published: true
   state: published
 
 inactive_article:
   type: Article
-  blog_id: 1
-  id: 14
   title: Inactive Article
   body: body
   extended: extended content
@@ -132,35 +119,14 @@ inactive_article:
   allow_comments: true
   allow_pings: true
   permalink: inactive-article
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: i1n2a3c4t5i6v7e
   published: true
   state: published
 
-second_blog_article:
-  type: Article
-  blog_id: 2
-  id: 16
-  title: Second Blog Article
-  body: body
-  extended: extended content
-  allow_comments: true
-  allow_pings: true
-  permalink: second-blog-article
-  created_at: 2004-04-01 12:00:00
-  updated_at: 2004-04-01 12:00:00
-  published_at: 2004-04-01 12:00:00
-  user_id: 1
-  author: Tobi
-  guid: 2b1l0o6g4ar7
-  published: true
-  state: published
-
 search_target:
   type: Article
-  blog_id: 1
-  id: 17
   title: Find me!
   body: search target
   extended: extended content
@@ -170,7 +136,7 @@ search_target:
   created_at: 2004-04-01 12:00:00
   updated_at: 2004-04-01 12:00:00
   published_at: 2004-04-01 12:00:00
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: 2b1l0o6g4ar7
   published: true
@@ -178,8 +144,6 @@ search_target:
 
 xmltest:
   type: Article
-  blog_id: 1
-  id: 18
   title: Associations aren't :dependent => true anymore
   body: originally seen on <a href="http://blog.rubyonrails.org/">blog.rubyonrails.org</a>
   extended: extended content
@@ -189,7 +153,7 @@ xmltest:
   created_at: 2003-04-28 05:31:00
   updated_at: 2003-04-28 05:31:00
   published_at: 2003-04-28 05:31:00
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: urn:uuid:0d676c66-4135-4a8b-9d65-b6a3248d3032
   published: true
@@ -197,8 +161,6 @@ xmltest:
 
 spammed_article:
   type: Article
-  blog_id: 1
-  id: 19
   title: C'mon Spam Me!
   body: A bunch of innocuous content
   allow_comments: true
@@ -207,7 +169,7 @@ spammed_article:
   created_at: 2001-01-01
   updated_at: 2001-01-01
   published_at: 2001-01-01
-  user_id: 1
+  user: tobi
   author: Tobi
   guid: urn:uuid:0d676c66-4135-4a8b-9d65-b6a3248d3023
   published: true

data/test/fixtures/feedback.yml

@@ -1,9 +1,7 @@
 spam_comment:
   type: Comment
-  blog_id: 1
-  id: 1
   published: true
-  article_id: 2
+  article: article2
   author: Bob Foo
   url: http://fakeurl.com
   body: Test <a href="http://fakeurl.co.uk">body</a>
@@ -15,12 +13,10 @@ spam_comment:
 
 comment2:
   type: Comment
-  blog_id: 1
-  id: 2
   published: true
-  article_id: 1
+  article: article1
   author: John Bar
-  user_id: 2
+  user: longbob
   url: www.google.com
   email: john.bar@google.com
   body: Comment body _italic_ *bold*
@@ -32,12 +28,10 @@ comment2:
 
 comment3:
   type: Comment
-  blog_id: 1
-  id: 3
   published: false
   state: presumed_spam
   status_confirmed: false
-  article_id: 1
+  article: article1
   author: Foo Bar
   body: Zzzzzz
   created_at: 2005-01-01 02:00:07
@@ -47,9 +41,7 @@ comment3:
 
 trackback1:
   type: Trackback
-  blog_id: 1
-  id: 4
-  article_id: 2
+  article: article2
   published: false
   state: presumed_spam
   status_confirmed: false
@@ -64,9 +56,7 @@ trackback1:
 
 trackback2:
   type: Trackback
-  blog_id: 1
-  id: 5
-  article_id: 1
+  article: article1
   state: presumed_ham
   published: true
   blog_name: Trackback Blog
@@ -80,9 +70,7 @@ trackback2:
 
 trackback3:
   type: Trackback
-  blog_id: 1
-  id: 6
-  article_id: 1
+  article: article1
   published: true
   state: presumed_ham
   blog_name: Trackback Blog 2
@@ -96,9 +84,7 @@ trackback3:
 
 trackback4:
   type: Trackback
-  blog_id: 1
-  id: 7
-  article_id: 17
+  article: search_target
   published: true
   state: presumed_ham
   blog_name: Trackback Blog 2
@@ -112,9 +98,7 @@ trackback4:
 
 old_comment:
   type: Comment
-  blog_id: 1
-  id: 8
-  article_id: 14
+  article: inactive_article
   author: John Bar
   guid: b1i2n3g4o5t6i7v
   url: www.google.com
@@ -128,10 +112,8 @@ old_comment:
 
 probably_spam_comment:
   type: Comment
-  blog_id: 1
-  id: 9
   published: false
-  article_id: 19
+  article: spammed_article
   author: Bob Foo
   url: http://fakeurl.com
   body: Test <a href="http://fakeurl.co.uk">body</a>
@@ -144,10 +126,8 @@ probably_spam_comment:
 
 definitely_spam_comment:
   type: Comment
-  blog_id: 1
-  id: 10
   published: false
-  article_id: 19
+  article: spammed_article
   author: Bob Foo
   url: http://fakeurl.com
   body: Test <a href="http://fakeurl.co.uk">body</a>

data/test/fixtures/profiles.yml

@@ -1,6 +1,15 @@
 admin:
   label: admin
   nicename: Typo administrator
+  modules:
+  - :dashboard
+  - :write
+  - :content
+  - :feedback
+  - :themes
+  - :sidebar
+  - :users
+  - :settings
 
 publisher:
   label: publisher

data/test/fixtures/redirects.yml

@@ -1,13 +1,10 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 foo_redirect:
-  id: 1
   from_path: foo/bar
   to_path: /someplace/else
 archive1_redirect:
-  id: 2
   from_path: archives/000001.html
   to_path: /articles/read/1
 rooted_bar_redirect:
-  id: 3
   from_path: bar/foo
   to_path: /blog/someplace/else

data/test/fixtures/resources.yml

@@ -1,23 +1,20 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 resource1:
-  id: 1
-  article_id: 1
+  article: article1
   filename: me.jpg
   mime: 'image/jpeg'
   created_at: <%= 1.week.ago.strftime("%Y-%m-%d %H:%M:%S") %>
   size: 100
 
 resource2:
-  id: 2
-  article_id: 1
+  article: article1
   filename: moi
   mime: 'image/jpeg'
   created_at: <%= 1.day.ago.strftime("%Y-%m-%d %H:%M:%S") %>
   size: 110
 
 resource3:
-  id: 3
-  article_id: 2
+  article: article2
   filename: my_latest_typo_patch.diff
   mime: 'text/plain'
   created_at: <%= 1.day.ago.strftime("%Y-%m-%d %H:%M:%S") %>