aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrick <technoweenie@gmail.com>2008-06-08 22:48:51 -0400
committerrick <technoweenie@gmail.com>2008-06-08 22:54:27 -0400
commit550f5e0736a06185bf3585d8f6efa6662dc1fac2 (patch)
tree4ebd40a197ee478facbeb207c421131c88ead7c7
parentbec7502c17b7fd969f6ef0e4e8aec5c00fe66b96 (diff)
re-remove default order by clause, see 177276643fce38c752004fd81614b8af5ac1587f
-rw-r--r--lib/acts_as_versioned.rb3
-rw-r--r--test/abstract_unit.rb7
-rw-r--r--test/versioned_test.rb10
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/acts_as_versioned.rb b/lib/acts_as_versioned.rb
index c94a075a0..031b70861 100644
--- a/lib/acts_as_versioned.rb
+++ b/lib/acts_as_versioned.rb
@@ -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?
diff --git a/test/abstract_unit.rb b/test/abstract_unit.rb
index 86f50620c..269667ad0 100644
--- a/test/abstract_unit.rb
+++ b/test/abstract_unit.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'))
diff --git a/test/versioned_test.rb b/test/versioned_test.rb
index 0c3fd4b2c..3422323d7 100644
--- a/test/versioned_test.rb
+++ b/test/versioned_test.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