From 1678f0d57af2339b6399c5971ca42822ef6d5888 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 27 Sep 2022 19:36:52 +0000 Subject: [PATCH] Fix failing test on PostgreSQL by ordering by only non null values (#37674). git-svn-id: https://svn.redmine.org/redmine/trunk@21860 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/user_query_test.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/unit/user_query_test.rb b/test/unit/user_query_test.rb index 0e67370e9..e48173be7 100644 --- a/test/unit/user_query_test.rb +++ b/test/unit/user_query_test.rb @@ -170,16 +170,23 @@ class UserQueryTest < ActiveSupport::TestCase end def test_auth_source_ordering + auth = AuthSource.generate!(name: "Auth") + user = User.find(1) user.update_column :auth_source_id, 1 + user2 = User.find(2) + user2.update_column :auth_source_id, auth.id + q = UserQuery.new name: '_' + q.add_filter('auth_source_id', '*', ['']) q.column_names = ['id', 'auth_source.name'] - q.sort_criteria = 'auth_source.name' + q.sort_criteria = [['auth_source.name', 'asc']] users = q.results_scope - assert users.many? - assert_equal user, users.last + + assert_equal 2, users.size + assert_equal [2, 1], users.ids end def find_users_with_query(query)