diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 33e39db..7db23bf 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -926,7 +926,7 @@ class ArticleTest < Test::Unit::TestCase assert_equal 'Tracked Article', ta.get_name.last assert_equal article.url, ta.get_url.last assert_kind_of Person, ta.user - ta.back_in_time(26.hours) + ta.created_at = Time.now.ago(26.hours); ta.save! article = TinyMceArticle.create! :name => 'Another Tracked Article', :profile_id => profile.id ta = ActionTracker::Record.last assert_equal ['Another Tracked Article'], ta.get_name diff --git a/vendor/plugins/action_tracker/lib/action_tracker_model.rb b/vendor/plugins/action_tracker/lib/action_tracker_model.rb index 8565b97..080a69c 100644 --- a/vendor/plugins/action_tracker/lib/action_tracker_model.rb +++ b/vendor/plugins/action_tracker/lib/action_tracker_model.rb @@ -37,7 +37,7 @@ module ActionTracker return if u.nil? target_hash = params[:target].nil? ? {} : {:target_type => params[:target].class.base_class.to_s, :target_id => params[:target].id} l = last :conditions => { :user_id => u.id, :user_type => u.class.base_class.to_s, :verb => params[:verb].to_s }.merge(target_hash) - if !l.nil? and Time.now - l.updated_at < ActionTrackerConfig.timeout + if !l.nil? and Time.now - l.created_at < ActionTrackerConfig.timeout params[:params].clone.each { |key, value| params[:params][key] = l.params[key].clone.push(value) } l.update_attributes params else diff --git a/vendor/plugins/action_tracker/test/action_tracker_model_test.rb b/vendor/plugins/action_tracker/test/action_tracker_model_test.rb index 2edcfa7..16552f8 100644 --- a/vendor/plugins/action_tracker/test/action_tracker_model_test.rb +++ b/vendor/plugins/action_tracker/test/action_tracker_model_test.rb @@ -175,7 +175,7 @@ class ActionTrackerModelTest < ActiveSupport::TestCase end assert_kind_of ActionTracker::Record, ta assert_equal ["bar"], ta.reload.params[:foo] - ta.updated_at = Time.now.ago(6.minutes) + ta.created_at = Time.now.ago(6.minutes) ta.send :update_without_callbacks t = ta.reload.updated_at assert_difference "ActionTracker::Record.count" do diff --git a/vendor/plugins/action_tracker/test/action_tracker_test.rb b/vendor/plugins/action_tracker/test/action_tracker_test.rb index 4f666a4..084bb85 100644 --- a/vendor/plugins/action_tracker/test/action_tracker_test.rb +++ b/vendor/plugins/action_tracker/test/action_tracker_test.rb @@ -295,7 +295,7 @@ class ActionTrackerTest < ActiveSupport::TestCase get :test, :foo => "bar" end t = ActionTracker::Record.last - t.updated_at = t.updated_at.ago(6.minutes) + t.created_at = t.updated_at.ago(6.minutes) t.send :update_without_callbacks assert_difference 'ActionTracker::Record.count' do get :test, :foo => "test" -- libgit2 0.21.2