From 4191e2b6f01587bf7590059ca8e1743792c08d85 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 13 Nov 2015 09:44:57 +1100 Subject: [PATCH] Changing the way select filters are reset on BOM to try and fix specs --- .../line_items/controllers/line_items_controller.js.coffee | 6 +++--- spec/features/admin/bulk_order_management_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index c95b4041f6..7f26c8bab9 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -29,9 +29,9 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $http, $q LineItems.allSaved() || confirm("Unsaved changes exist and will be lost if you continue.") $scope.resetSelectFilters = -> - $scope.distributorFilter = $scope.distributors[0].id - $scope.supplierFilter = $scope.suppliers[0].id - $scope.orderCycleFilter = $scope.orderCycles[0].id + $scope.distributorFilter = blankOption().id + $scope.supplierFilter = blankOption().id + $scope.orderCycleFilter = blankOption().id $scope.quickSearch = "" $scope.refreshData = -> diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index 16c42a1013..18754b65d9 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -283,7 +283,7 @@ feature %q{ it "displays a select box for order cycles, which filters line items by the selected order cycle", retry: 3 do expect(page).to have_selector '#s2id_order_cycle_filter a.select2-choice', text: 'All' - expect(page).to have_select2 'order_cycle_filter', options: OrderCycle.order('orders_close_at DESC').pluck(:name).unshift("All") + expect(page).to have_select2 'order_cycle_filter', with_options: OrderCycle.pluck(:name).unshift("All") expect(page).to have_selector "tr#li_#{li1.id}" expect(page).to have_selector "tr#li_#{li2.id}" select2_select oc1.name, from: "order_cycle_filter"