From fe4a71848ed8375f93222975e7234462940f3ebd Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Tue, 31 Jan 2023 14:38:42 +0100
Subject: [PATCH] DEV: Fix flaky specs by explicitly ordering tags (#20097)

---
 app/controllers/tags_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f4b75c2330d..5604b401d29 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -42,6 +42,7 @@ class TagsController < ::ApplicationController
     if SiteSetting.tags_listed_by_group
       ungrouped_tags = Tag.where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships)")
       ungrouped_tags = ungrouped_tags.used_tags_in_regular_topics(guardian) unless show_all_tags
+      ungrouped_tags = ungrouped_tags.order(:id)
 
       grouped_tag_counts =
         TagGroup
@@ -60,6 +61,7 @@ class TagsController < ::ApplicationController
       @extras = { tag_groups: grouped_tag_counts }
     else
       tags = show_all_tags ? Tag.all : Tag.used_tags_in_regular_topics(guardian)
+      tags = tags.order(:id)
       unrestricted_tags = DiscourseTagging.filter_visible(tags.where(target_tag_id: nil), guardian)
 
       categories =