Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cc0ea69401e..d098f0b4c4a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1434,6 +1434,20 @@ RSpec.describe User, feature_category: :user_profile do
       end
     end
 
+    describe '.ordered_by_id_desc' do
+      let_it_be(:first_user) { create(:user) }
+      let_it_be(:second_user) { create(:user) }
+
+      it 'generates the order SQL in descending order' do
+        expect(described_class.ordered_by_id_desc.to_sql).to include(
+          'ORDER BY "users"."id" DESC')
+      end
+
+      it 'sorts users correctly' do
+        expect(described_class.ordered_by_id_desc).to eq([second_user, first_user])
+      end
+    end
+
     describe '.trusted' do
       let_it_be(:trusted_user1) { create(:user, :trusted) }
       let_it_be(:trusted_user2) { create(:user, :trusted) }