@@ -355,7 +355,7 @@ module ActiveRecord #:nodoc: end def altered? - self.track_altered_attributes ? (self.version_if_changed.map(&:to_s) - changed).length > 0 : changed? + self.track_altered_attributes ? (self.version_if_changed.map(&:to_s) - changed).length == 0 : changed? end # Clones a model. Used when saving a new version or reverting a model's version. lib/acts_as_versioned.rb @@ -187,7 +187,10 @@ class VersionedTest < Test::Unit::TestCase p.save p.save 5.times do |i| - assert_page_title p, i + p.title = "title#{i}" + p.save + assert_equal "title#{i}", p.title + assert_equal (i+2), p.version end end @@ -196,7 +199,10 @@ class VersionedTest < Test::Unit::TestCase p.update_attributes(:title => "title1") p.update_attributes(:title => "title2") 5.times do |i| - assert_page_title p, i, :lock_version + p.title = "title#{i}" + p.save + assert_equal "title#{i}", p.title + assert_equal (i+4), p.lock_version assert p.versions(true).size <= 2, "locked version can only store 2 versions" end end @@ -236,13 +242,6 @@ class VersionedTest < Test::Unit::TestCase assert_equal 2, p.versions(true).size # version 1 deleted end - def assert_page_title(p, i, version_field = :version) - p.title = "title#{i}" - p.save - assert_equal "title#{i}", p.title - assert_equal (i+4), p.send(version_field) - end - def test_find_versions assert_equal 2, locked_pages(:welcome).versions.size assert_equal 1, locked_pages(:welcome).versions.find(:all, :conditions => ['title LIKE ?', '%weblog%']).length test/versioned_test.rb 70e8ad4ce56aadea79018acaf6014fdc1c931eaa Asa Calow mothership@asacalow.co.uk http://github.com/codafoo/acts_as_versioned/commit/bec7502c17b7fd969f6ef0e4e8aec5c00fe66b96 bec7502c17b7fd969f6ef0e4e8aec5c00fe66b96 2008-05-29T13:24:40-07:00 2008-05-29T13:24:40-07:00 Modified acts_as_versioned to work with ActiveRecord's dirty attribute checking. 4cf29cdb0f73723847bc3e856c4b58c0ddd097e7 Asa Calow mothership@asacalow.co.uk