Allow aggregate to order by slug and paint chapters list more nicely

2 files changed, 15 insertions, 2 deletions

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index d7d8b9a6..2dd0759a 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -13,8 +13,8 @@ class UsersControllerTest < ActionController::TestCase
     login_as :aaron
     get :index
     assert_response :success
-    assert_select "button[type=submit]", I18n.t("users.user.deactivate")
-    assert_select "a", I18n.t("admin.common.show")
+    assert_select "button[type=submit][aria-label=?]", I18n.t("users.user.deactivate")
+    assert_select "a[aria-label=?]", I18n.t("admin.common.show")
   end
  
   test "get new when logged in as admin" do
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index 395b6315..b737e8b0 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -425,4 +425,17 @@ class PageTest < ActiveSupport::TestCase
     assert_includes     names, "updates/inside-post"
     assert_not_includes names, "outside-post"
   end
+
+  test "an aggregate can order by node slug" do
+    parent = Node.root.children.create!(:slug => "slug_order_parent")
+    %w[zulu alpha Mike].each do |slug|
+      node = parent.children.create!(:slug => slug)
+      node.reload.draft.update!(:title => "T-#{slug}", :tag_list => "slug-order-test")
+      node.publish_draft!
+    end
+
+    names = Page.aggregate({ :tags => "slug-order-test",
+                             :order_by => "slug" }).map { |p| p.node.slug }
+    assert_equal %w[alpha Mike zulu], names
+  end
 end