From bc7ec23f4ef9ee5f8a8e7ec7b17af6652e4d438e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 9 Nov 2005 12:50:35 +0000
Subject: Fixed acts_as_list for definitions without an explicit :order #2803
 [jonathan@bluewire.net.nz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2951 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/test/fixtures/mixin.rb   |  6 +++++-
 activerecord/test/fixtures/mixins.yml | 12 +++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/fixtures')

diff --git a/activerecord/test/fixtures/mixin.rb b/activerecord/test/fixtures/mixin.rb
index c583fe495e..a0a92c4f64 100644
--- a/activerecord/test/fixtures/mixin.rb
+++ b/activerecord/test/fixtures/mixin.rb
@@ -6,6 +6,10 @@ class TreeMixin < Mixin
     acts_as_tree :foreign_key => "parent_id", :order => "id"
 end
 
+class TreeMixinWithoutOrder < Mixin
+    acts_as_tree :foreign_key => "parent_id"
+end
+
 class ListMixin < Mixin
   acts_as_list :column => "pos", :scope => :parent
 
@@ -35,4 +39,4 @@ class NestedSetWithSymbolScope < Mixin
   acts_as_nested_set :scope => :root
   
   def self.table_name() "mixins" end
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/fixtures/mixins.yml b/activerecord/test/fixtures/mixins.yml
index 1d990c2e8e..7b20965512 100644
--- a/activerecord/test/fixtures/mixins.yml
+++ b/activerecord/test/fixtures/mixins.yml
@@ -28,7 +28,17 @@ tree3_1:
   id: 1006
   type: TreeMixin
   parent_id:
-  
+
+tree_without_order_1:
+  id: 1101
+  type: TreeMixinWithoutOrder
+  parent_id:
+
+tree_without_order_2:
+  id: 1100
+  type: TreeMixinWithoutOrder
+  parent_id:
+
 # List mixins
 
 <% (1..4).each do |counter| %>  
-- 
cgit v1.2.3