From 246934d8ba94e47d80e7dce5c1d288c393409a3a Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Sat, 12 Sep 2020 12:35:34 -0700 Subject: [PATCH] update preference name in factor and specs --- .../spree/admin/shipping_methods_controller_spec.rb | 4 ++-- spec/factories/calculator_factory.rb | 6 +++--- spec/features/consumer/shopping/cart_spec.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb index 9d05a8c440..2c1fa2c0b6 100644 --- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb @@ -40,11 +40,11 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do it "updates preferred_unit of a Weight calculator" do shipping_method.calculator = create(:weight_calculator, calculable: shipping_method) - params[:shipping_method][:calculator_attributes][:preferred_unit] = "kg" + params[:shipping_method][:calculator_attributes][:preferred_unit_from_list] = "kg" spree_post :update, params - expect(shipping_method.reload.calculator.preferred_unit).to eq "kg" + expect(shipping_method.reload.calculator.preferred_unit_from_list).to eq "kg" end it "updates preferred_flat_percent of a FlatPercentPerItem calculator" do diff --git a/spec/factories/calculator_factory.rb b/spec/factories/calculator_factory.rb index 196fefa935..1203d5b52c 100644 --- a/spec/factories/calculator_factory.rb +++ b/spec/factories/calculator_factory.rb @@ -15,11 +15,11 @@ FactoryBot.define do factory :weight_calculator, class: Calculator::Weight do after(:build) { |c| c.set_preference(:per_unit, 0.5) - c.set_preference(:unit, "kg") + c.set_preference(:unit_from_list, "kg") } - after(:create) { |c| + after(:create) { |c| c.set_preference(:per_unit, 0.5) - c.set_preference(:unit, "kg") + c.set_preference(:unit_from_list, "kg") c.save! } end diff --git a/spec/features/consumer/shopping/cart_spec.rb b/spec/features/consumer/shopping/cart_spec.rb index 9597e8a35e..d702ce7067 100644 --- a/spec/features/consumer/shopping/cart_spec.rb +++ b/spec/features/consumer/shopping/cart_spec.rb @@ -118,7 +118,7 @@ feature "full-page cart", js: true do describe "admin weight calculated fees" do context "order with 2 line items" do let(:admin_fee) { - create(:enterprise_fee, calculator: Calculator::Weight.new(preferred_per_unit: 1, preferred_unit: "kg"), + create(:enterprise_fee, calculator: Calculator::Weight.new(preferred_per_unit: 1, preferred_unit_from_list: "kg"), enterprise: order_cycle.coordinator, fee_type: 'admin') }