@@ -198,8 +198,7 @@ module ActiveRecord #:nodoc: self.version_association_options = { :class_name => "#{self.to_s}::#{versioned_class_name}", :foreign_key => versioned_foreign_key, - :dependent => :delete_all, - :order => 'version' + :dependent => :delete_all }.merge(options[:association_options] || {}) if block_given? lib/acts_as_versioned.rb @@ -10,6 +10,13 @@ rescue LoadError require 'rubygems' retry end + +begin + require 'ruby-debug' + Debugger.start +rescue LoadError +end + require 'acts_as_versioned' config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) test/abstract_unit.rb @@ -32,7 +32,7 @@ class VersionedTest < Test::Unit::TestCase assert_equal 24, p.version assert_equal 'Welcome to the weblog', p.title - assert p.revert_to!(p.versions.first.version), "Couldn't revert to 23" + assert p.revert_to!(23), "Couldn't revert to 23" assert_equal 23, p.version assert_equal 'Welcome to the weblg', p.title end @@ -59,7 +59,7 @@ class VersionedTest < Test::Unit::TestCase assert_equal 24, p.version assert_equal 'Welcome to the weblog', p.title - assert p.revert_to!(p.versions.first), "Couldn't revert to 23" + assert p.revert_to!(p.versions.find_by_version(23)), "Couldn't revert to 23" assert_equal 23, p.version assert_equal 'Welcome to the weblg', p.title end @@ -213,11 +213,6 @@ class VersionedTest < Test::Unit::TestCase assert SpecialLockedPage.track_altered_attributes end - def test_version_order - assert_equal 23, pages(:welcome).versions.first.version - assert_equal 24, pages(:welcome).versions.last.version - end - def test_track_altered_attributes p = LockedPage.create! :title => "title" assert_equal 1, p.lock_version @@ -288,7 +283,6 @@ class VersionedTest < Test::Unit::TestCase association = Page.reflect_on_association(:versions) options = association.options assert_equal :delete_all, options[:dependent] - assert_equal 'version', options[:order] association = Widget.reflect_on_association(:versions) options = association.options test/versioned_test.rb bec7502c17b7fd969f6ef0e4e8aec5c00fe66b96 rick technoweenie@gmail.com http://github.com/codafoo/acts_as_versioned/commit/550f5e0736a06185bf3585d8f6efa6662dc1fac2 550f5e0736a06185bf3585d8f6efa6662dc1fac2 2008-06-08T19:54:27-07:00 2008-06-08T19:48:51-07:00 re-remove default order by clause, see 177276643fce38c752004fd81614b8af5ac1587f 4ebd40a197ee478facbeb207c421131c88ead7c7 rick technoweenie@gmail.com