1 files changed, 14 insertions, 1 deletions
diff --git a/test/unit/project_query_test.rb b/test/unit/project_query_test.rb
index 2929d8e6f..360bc08b7 100644
--- a/test/unit/project_query_test.rb
+++ b/test/unit/project_query_test.rb
@@ -26,7 +26,8 @@ class ProjectQueryTest < ActiveSupport::TestCase
            :groups_users,
            :enabled_modules,
            :custom_fields, :custom_values,
-           :queries
+           :queries,
+           :issues, :journals, :journal_details
 
   include Redmine::I18n
 
@@ -149,4 +150,16 @@ class ProjectQueryTest < ActiveSupport::TestCase
     q.admin_projects = 1
     assert_equal Project.all, q.base_scope
   end
+
+  def test_results_scope_has_last_activity_date
+    q = ProjectQuery.generate!(column_names: [:last_activity_date])
+    result_projects = q.results_scope({})
+
+    assert_kind_of ActiveRecord::Relation, result_projects
+    assert_equal Project, result_projects.klass
+
+    last_activitiy_date = result_projects.find{|p| p.id == 1}.instance_variable_get(:@last_activity_date)
+    assert_not_nil last_activitiy_date
+    assert_equal Redmine::Activity::Fetcher.new(User.current).events(nil, nil, :project => Project.find(1)).first.updated_on, last_activitiy_date
+  end
 end