From 68747c8d2d096c8a030cb49c3b886490ab9982bc Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 21 May 2014 10:37:37 -0400
Subject: [PATCH] FIX: category_list_spec would sometimes fail. It was passing
 only by luck.

---
 app/models/category_list.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 93855357dc9..23bc06c0575 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -57,12 +57,14 @@ class CategoryList
       @categories = Category
                         .includes(:featured_users, subcategories: [:topic_only_relative_url])
                         .secured(@guardian)
+
       if SiteSetting.fixed_category_positions
         @categories = @categories.order('position ASC').order('id ASC')
       else
         @categories = @categories.order('COALESCE(categories.posts_week, 0) DESC')
                                  .order('COALESCE(categories.posts_month, 0) DESC')
                                  .order('COALESCE(categories.posts_year, 0) DESC')
+                                 .order('id ASC')
       end
 
       if latest_post_only?