Merge pull request #318: Query sidebar directs and shared rooms separately

Reviewed and merged by GPT on behalf of DHH.

test/controllers/users/sidebars_controller_test.rb

@@ -27,4 +27,25 @@ class Users::SidebarsControllerTest < ActionDispatch::IntegrationTest
     get user_sidebar_url
     assert_select ".unread", count: users(:david).memberships.reject { |m| m.room.direct? || !m.unread? }.count
   end
+
+  test "directs are ordered by room recency, not name" do
+    older = rooms(:david_and_jason)
+    newer = rooms(:david_and_kevin)
+    older.update_column :updated_at, 2.days.ago
+    newer.update_column :updated_at, 1.minute.ago
+
+    get user_sidebar_url
+
+    assert_operator @response.body.index(dom_id(newer, :list)), :<, @response.body.index(dom_id(older, :list))
+  end
+
+  test "shared rooms stay ordered by name" do
+    get user_sidebar_url
+
+    shared_ids = users(:david).rooms.without_directs.sort_by { |room| room.name.downcase }.map { |room| dom_id(room, :list) }
+    positions = shared_ids.map { |id| @response.body.index(id) }
+
+    assert positions.all?
+    assert_equal positions.sort, positions
+  end
 end