From dcecfaea87e0237f3b8c7d34f7635a55940a9940 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sat, 23 Jan 2021 09:19:11 +0000 Subject: [PATCH] Fix params issues in OrderCyclescontroller spec --- app/controllers/admin/order_cycles_controller.rb | 8 +++++--- spec/controllers/admin/order_cycles_controller_spec.rb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/order_cycles_controller.rb b/app/controllers/admin/order_cycles_controller.rb index 3482be399f..77eab67142 100644 --- a/app/controllers/admin/order_cycles_controller.rb +++ b/app/controllers/admin/order_cycles_controller.rb @@ -199,10 +199,12 @@ module Admin end def remove_protected_attrs - params[:order_cycle].delete :coordinator_id + return unless order_cycle_params[:order_cycle] + + order_cycle_params[:order_cycle].delete :coordinator_id unless Enterprise.managed_by(spree_current_user).include?(@order_cycle.coordinator) - params[:order_cycle].delete_if do |k, _v| + order_cycle_params[:order_cycle].delete_if do |k, _v| [:name, :orders_open_at, :orders_close_at].include? k.to_sym end end @@ -238,7 +240,7 @@ module Admin end def order_cycle_params - PermittedAttributes::OrderCycle.new(params).call + @order_cycle_params ||= PermittedAttributes::OrderCycle.new(params).call.to_h.with_indifferent_access end def order_cycle_bulk_params diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb index 96eba697b0..65fdedbd74 100644 --- a/spec/controllers/admin/order_cycles_controller_spec.rb +++ b/spec/controllers/admin/order_cycles_controller_spec.rb @@ -187,7 +187,7 @@ module Admin it "can update preference product_selection_from_coordinator_inventory_only" do expect(OrderCycleForm).to receive(:new). with(order_cycle, - { "preferred_product_selection_from_coordinator_inventory_only" => true }, + { "preferred_product_selection_from_coordinator_inventory_only" => "true" }, anything) { form_mock } allow(form_mock).to receive(:save) { true }