From a0a361673ae8093a698dc7724b02c6799edad36e Mon Sep 17 00:00:00 2001 From: David Cook Date: Sat, 18 Apr 2020 15:03:35 +1000 Subject: [PATCH 1/2] Fix sorting of orders (wrong copied function call) --- .../admin/orders/controllers/orders_controller.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee index d4d86b7ddb..e98fcccb2a 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -67,7 +67,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque return unless sort && sort.predicate != "" $scope.sorting = sort.getSortingExpr() - $scope.fetchProducts() + $scope.fetchResults() , true $scope.capturePayment = (order) -> From 910cc99c2f299fa20db8f05ed91de2a55815a796 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 18 Apr 2020 10:23:02 +0100 Subject: [PATCH 2/2] Add spec to cover orders_controller watch sortOptions --- .../controllers/customers_controller_spec.js.coffee | 1 - .../controllers/orders_controller_spec.js.coffee | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee b/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee index a30eb4eeb8..2ffde63a3e 100644 --- a/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee @@ -20,7 +20,6 @@ describe "CustomersCtrl", -> {id: 109, name: "Australia", states: [{id: 55, name: "ACT", abbr: "ACT"}]} ] - inject ($controller, $rootScope, _CustomerResource_, $httpBackend) -> scope = $rootScope http = $httpBackend diff --git a/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee b/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee index 7886d8ddd6..2e7cfee530 100644 --- a/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee @@ -36,9 +36,18 @@ describe "ordersCtrl", -> 'q[s]': 'completed_at desc' })) - describe "using pagination", -> it "changes the page", -> $scope.changePage(2) expect($scope.page).toEqual 2 expect(Orders.index).toHaveBeenCalled() + + describe "sorting products", -> + it "sorts orders", -> + spyOn $scope, "fetchResults" + + $scope.sortOptions.toggle('number') + $scope.$apply() + + expect($scope.sorting).toEqual 'number asc' + expect($scope.fetchResults).toHaveBeenCalled()