From d246a68a242e28c106ab8916ccdc3ac2643b2d96 Mon Sep 17 00:00:00 2001
From: randx <dmitriy.zaporozhets@gmail.com>
Date: Thu, 30 Aug 2012 19:45:05 +0300
Subject: [PATCH] fix project.last_activity spec
---
app/models/project.rb | 2 +-
spec/models/project_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/project.rb b/app/models/project.rb
index 3c7287f8d3d..a7735a42137 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -158,7 +158,7 @@ class Project < ActiveRecord::Base
end
def last_activity
- events.order("created_at DESC").first || nil
+ events.order("created_at ASC").last
end
def last_activity_date
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index b947eeb290a..5add7ff88a9 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -141,7 +141,7 @@ describe Project do
let(:last_event) { double }
before do
- project.stub(:events).and_return( [ double, double, last_event ] )
+ project.stub_chain(:events, :order).and_return( [ double, double, last_event ] )
end
it { project.last_activity.should == last_event }
--
GitLab