From acc16a5f1d593a3768d4930c5aa9eb054ec243dd Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Tue, 22 Dec 2015 10:18:35 -0800 Subject: [PATCH] Ensure that App#<=> is used for sorting --- app/controllers/apps_controller.rb | 2 +- spec/controllers/apps_controller_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb index a0366ac..2d5205a 100644 --- a/app/controllers/apps_controller.rb +++ b/app/controllers/apps_controller.rb @@ -9,7 +9,7 @@ class AppsController < ApplicationController expose(:app_scope) { App } expose(:apps) do - app_scope.all.sort.map { |app| AppDecorator.new(app) } + app_scope.all.to_a.sort.map { |app| AppDecorator.new(app) } end expose(:app, ancestor: :app_scope, attributes: :app_params) diff --git a/spec/controllers/apps_controller_spec.rb b/spec/controllers/apps_controller_spec.rb index c4c5e67..f46da27 100644 --- a/spec/controllers/apps_controller_spec.rb +++ b/spec/controllers/apps_controller_spec.rb @@ -34,7 +34,7 @@ describe AppsController, type: 'controller' do sign_in admin unwatched_app && watched_app1 && watched_app2 get :index - expect(controller.apps.entries).to eq App.all.sort.entries + expect(controller.apps.entries).to eq App.all.to_a.sort.entries end end @@ -43,7 +43,7 @@ describe AppsController, type: 'controller' do sign_in user unwatched_app && watched_app1 && watched_app2 get :index - expect(controller.apps.entries).to eq App.all.sort.entries + expect(controller.apps.entries).to eq App.all.to_a.sort.entries end end end -- libgit2 0.21.2