Merged r1307 to r1369 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1370 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/fixtures/attachments.yml

@@ -23,4 +23,17 @@ attachments_002:
   filesize: 28
   filename: document.txt
   author_id: 2
+attachments_003: 
+  created_on: 2006-07-19 21:07:27 +02:00
+  downloads: 0
+  content_type: image/gif
+  disk_filename: 060719210727_logo.gif
+  container_id: 4
+  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+  id: 3
+  container_type: WikiPage
+  filesize: 280
+  filename: logo.gif
+  description: This is a logo
+  author_id: 2
   

test/fixtures/custom_fields.yml

@@ -3,7 +3,7 @@ custom_fields_001:
   name: Database
   min_length: 0
   regexp: ""
-  is_for_all: false
+  is_for_all: true
   type: IssueCustomField
   max_length: 0
   possible_values: MySQL|PostgreSQL|Oracle

test/fixtures/queries.yml

@@ -1,7 +1,9 @@
 --- 
 queries_001: 
-  name: Multiple custom fields query
+  id: 1
   project_id: 1
+  is_public: true
+  name: Multiple custom fields query
   filters: |
     --- 
     cf_1: 
@@ -17,6 +19,51 @@ queries_001:
       - "125"
       :operator: "="
 
-  id: 1
-  is_public: true
   user_id: 1
+  column_names: 
+queries_002: 
+  id: 2
+  project_id: 1
+  is_public: false
+  name: Private query for cookbook
+  filters: |
+    --- 
+    tracker_id: 
+      :values: 
+      - "3"
+      :operator: "="
+    status_id: 
+      :values: 
+      - "1"
+      :operator: o
+
+  user_id: 3
+  column_names: 
+queries_003: 
+  id: 3
+  project_id: 
+  is_public: false
+  name: Private query for all projects
+  filters: |
+    --- 
+    tracker_id: 
+      :values: 
+      - "3"
+      :operator: "="
+
+  user_id: 3
+  column_names: 
+queries_004: 
+  id: 4
+  project_id: 
+  is_public: true
+  name: Public query for all projects
+  filters: |
+    --- 
+    tracker_id: 
+      :values: 
+      - "3"
+      :operator: "="
+
+  user_id: 2
+  column_names: 

test/fixtures/roles.yml

@@ -57,7 +57,6 @@ roles_002:
     - :add_issue_notes
     - :move_issues
     - :delete_issues
-    - :manage_public_queries
     - :save_queries
     - :view_gantt
     - :view_calendar
@@ -94,7 +93,6 @@ roles_003:
     - :manage_issue_relations
     - :add_issue_notes
     - :move_issues
-    - :manage_public_queries
     - :save_queries
     - :view_gantt
     - :view_calendar

test/fixtures/time_entries.yml

@@ -15,7 +15,7 @@ time_entries_001:
   tyear: 2007
 time_entries_002: 
   created_on: 2007-03-23 14:11:04 +01:00
-  tweek: 12
+  tweek: 11
   tmonth: 3
   project_id: 1
   comments: ""
@@ -36,7 +36,7 @@ time_entries_003:
   updated_on: 2007-04-21 12:20:48 +02:00
   activity_id: 9
   spent_on: 2007-04-21
-  issue_id: 2
+  issue_id: 3
   id: 3
   hours: 1.0
   user_id: 1

test/fixtures/wiki_contents.yml

@@ -15,6 +15,8 @@ wiki_contents_002:
     h1. Another page
     
     This is a link to a ticket: #2
+    And this is an included page:
+    {{include(Page with an inline image)}}
   updated_on: 2007-03-08 00:18:07 +01:00
   page_id: 2
   id: 2
@@ -32,3 +34,17 @@ wiki_contents_003:
   version: 1
   author_id: 1
   comments: 
+wiki_contents_004: 
+  text: |-
+    h1. Page with an inline image
+    
+    This is an inline image:
+    
+    !logo.gif!
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 4
+  id: 4
+  version: 1
+  author_id: 1
+  comments: 
+  

test/fixtures/wiki_pages.yml

@@ -14,4 +14,9 @@ wiki_pages_003:
   title: Start_page
   id: 3
   wiki_id: 2
+wiki_pages_004: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Page_with_an_inline_image
+  id: 4
+  wiki_id: 1