From 24afa218850bf9dbfe8917426438d4bacbee1210 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 22 Sep 2019 16:30:52 +0100 Subject: [PATCH] Revert "Change products controller to clear variants unit description if variant_unit is items" This reverts commit 1a4e83d63388409e9748656bca443528f6454beb. --- .../spree/admin/products_controller_decorator.rb | 8 -------- .../spree/admin/products_controller_spec.rb | 13 ------------- 2 files changed, 21 deletions(-) diff --git a/app/controllers/spree/admin/products_controller_decorator.rb b/app/controllers/spree/admin/products_controller_decorator.rb index e05ba14792..1554ab08a0 100644 --- a/app/controllers/spree/admin/products_controller_decorator.rb +++ b/app/controllers/spree/admin/products_controller_decorator.rb @@ -44,8 +44,6 @@ Spree::Admin::ProductsController.class_eval do delete_stock_params_and_set_after do super end - - clear_variants_unit_description if @object.variant_unit == 'items' end def bulk_update @@ -190,10 +188,4 @@ Spree::Admin::ProductsController.class_eval do def set_product_master_variant_price_to_zero @product.price = 0 if @product.price.nil? end - - def clear_variants_unit_description - @object.variants.each do |variant| - variant.update_attribute :unit_description, '' - end - end end diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb index 0466ec6564..7a73954f42 100644 --- a/spec/controllers/spree/admin/products_controller_spec.rb +++ b/spec/controllers/spree/admin/products_controller_spec.rb @@ -194,19 +194,6 @@ describe Spree::Admin::ProductsController, type: :controller do end end - describe "product variant unit is items" do - it "clears unit description of all variants of the product" do - product.variants.first.update_attribute :unit_description, "grams" - spree_put :update, - id: product, - product: { - variant_unit: "items", - variant_unit_name: "bag" - } - expect(product.reload.variants.first.unit_description).to be_empty - end - end - describe "product properties" do context "as an enterprise user" do let!(:property) { create(:property, name: "A nice name") }