3 files changed, 28 insertions, 2 deletions
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| %>  
diff --git a/activerecord/test/mixin_test.rb b/activerecord/test/mixin_test.rb
index b551fb4402..82b2a143fd 100644
--- a/activerecord/test/mixin_test.rb
+++ b/activerecord/test/mixin_test.rb
@@ -291,6 +291,18 @@ class TreeTest < Test::Unit::TestCase
   end
 end
 
+class TreeTestWithoutOrder < Test::Unit::TestCase
+  fixtures :mixins
+  
+  def test_root
+    assert [mixins(:tree_without_order_1), mixins(:tree_without_order_2)].include?(TreeMixinWithoutOrder.root)
+  end                                                                  
+
+  def test_roots
+    assert_equal [], [mixins(:tree_without_order_1), mixins(:tree_without_order_2)] - TreeMixinWithoutOrder.roots
+  end
+end
+
 class TouchTest < Test::Unit::TestCase
   fixtures :mixins