1 files changed, 4 insertions, 12 deletions
diff --git a/activerecord/test/fixtures/mixin.rb b/activerecord/test/fixtures/mixin.rb
index 589c1a8c23..8cae604140 100644
--- a/activerecord/test/fixtures/mixin.rb
+++ b/activerecord/test/fixtures/mixin.rb
@@ -1,21 +1,13 @@
 class Mixin < ActiveRecord::Base
-  include ActiveRecord::Mixins::Touch
-  include ActiveRecord::Mixins::Tree
+  acts_as_tree :foreign_key => "parent_id", :order => "id"
+
 end
 
 class ListMixin < ActiveRecord::Base
-  include ActiveRecord::Mixins::List
-   
+  acts_as_list :column => "pos", :scope => :parent_id
+
   def self.table_name
     "mixins"
   end
     
-  def scope_condition
-     "parent_id = #{self.parent_id}"
-  end      
-  
-  def position_column
-    "pos"
-  end
-
 end
 \ No newline at end of file