spree_backend 3.2.1 → 3.2.2

data/spec/features/admin/products/prototypes_spec.rb

@@ -1,112 +0,0 @@
-require 'spec_helper'
-
-describe "Prototypes", type: :feature, js: true do
-  stub_authorization!
-
-  context "listing prototypes" do
-    it "should be able to list existing prototypes" do
-      create(:property, name: "model", presentation: "Model")
-      create(:property, name: "brand", presentation: "Brand")
-      create(:property, name: "shirt_fabric", presentation: "Fabric")
-      create(:property, name: "shirt_sleeve_length", presentation: "Sleeve")
-      create(:property, name: "mug_type", presentation: "Type")
-      create(:property, name: "bag_type", presentation: "Type")
-      create(:property, name: "manufacturer", presentation: "Manufacturer")
-      create(:property, name: "bag_size", presentation: "Size")
-      create(:property, name: "mug_size", presentation: "Size")
-      create(:property, name: "gender", presentation: "Gender")
-      create(:property, name: "shirt_fit", presentation: "Fit")
-      create(:property, name: "bag_material", presentation: "Material")
-      create(:property, name: "shirt_type", presentation: "Type")
-      p = create(:prototype, name: "Shirt")
-      %w( brand gender manufacturer model shirt_fabric shirt_fit shirt_sleeve_length shirt_type ).each do |prop|
-        p.properties << Spree::Property.find_by_name(prop)
-      end
-      p = create(:prototype, name: "Mug")
-      %w( mug_size mug_type ).each do |prop|
-        p.properties << Spree::Property.find_by_name(prop)
-      end
-      p = create(:prototype, name: "Bag")
-      %w( bag_type bag_material ).each do |prop|
-        p.properties << Spree::Property.find_by_name(prop)
-      end
-
-      visit spree.admin_path
-      click_link "Products"
-      click_link "Prototypes"
-
-      within_row(1) { expect(column_text(1)).to eq "Shirt" }
-      within_row(2) { expect(column_text(1)).to eq "Mug" }
-      within_row(3) { expect(column_text(1)).to eq "Bag" }
-    end
-  end
-
-  context "creating a prototype" do
-    it "should allow an admin to create a new product prototype" do
-      visit spree.admin_path
-      click_link "Products"
-      click_link "Prototypes"
-
-      click_link "new_prototype_link"
-      within('.content-header') do
-        expect(page).to have_content("New Prototype")
-      end
-      fill_in "prototype_name", with: "male shirts"
-      click_button "Create"
-      expect(page).to have_content("successfully created!")
-      click_link "Products"
-      click_link "Prototypes"
-      within_row(1) { click_icon :edit }
-      fill_in "prototype_name", with: "Shirt 99"
-      click_button "Update"
-      expect(page).to have_content("successfully updated!")
-      expect(page).to have_content("Shirt 99")
-    end
-  end
-
-  context "editing a prototype" do
-    it "should allow to empty its properties" do
-      model_property = create(:property, name: "model", presentation: "Model")
-      brand_property = create(:property, name: "brand", presentation: "Brand")
-
-      shirt_prototype = create(:prototype, name: "Shirt", properties: [])
-      %w( brand model ).each do |prop|
-        shirt_prototype.properties << Spree::Property.find_by_name(prop)
-      end
-
-      visit spree.admin_path
-      click_link "Products"
-      click_link "Prototypes"
-
-      click_icon :edit
-      property_ids = find_field("prototype_property_ids").value.map(&:to_i)
-      expect(property_ids).to match_array [model_property.id, brand_property.id]
-
-      unselect "Brand", from: "prototype_property_ids"
-      unselect "Model", from: "prototype_property_ids"
-
-      click_button 'Update'
-
-      click_icon :edit
-
-      expect(find_field("prototype_property_ids").value).to be_empty
-    end
-  end
-
-  it 'should be deletable' do
-    shirt_prototype = create(:prototype, name: "Shirt", properties: [])
-    shirt_prototype.taxons << create(:taxon)
-
-    visit spree.admin_path
-    click_link "Products"
-    click_link "Prototypes"
-
-    within("#spree_prototype_#{shirt_prototype.id}") do
-      page.find('.delete-resource').click
-    end
-
-    accept_alert do
-      expect(page).to have_content("Prototype \"#{shirt_prototype.name}\" has been successfully removed!")
-    end
-  end
-end

data/spec/features/admin/products/stock_management_spec.rb

@@ -1,124 +0,0 @@
-require 'spec_helper'
-
-describe "Stock Management", type: :feature, js: true do
-  stub_authorization!
-
-  context "given a product with a variant and a stock location" do
-    let!(:stock_location) { create(:stock_location, name: 'Default') }
-    let!(:product) { create(:product, name: 'apache baseball cap', price: 10) }
-    let!(:variant) { product.master }
-
-    before do
-      stock_location.stock_item(variant).update_column(:count_on_hand, 10)
-      visit spree.stock_admin_product_path(product)
-    end
-
-    context "toggle backorderable for a variant's stock item" do
-      let(:backorderable) { find ".stock_item_backorderable" }
-
-      before do
-        expect(backorderable).to be_checked
-        backorderable.set(false)
-        wait_for_ajax
-      end
-
-      it "persists the value when page reload" do
-        visit current_path
-        expect(backorderable).not_to be_checked
-      end
-    end
-
-    context "toggle track inventory for a variant's stock item" do
-      let(:track_inventory) { find ".track_inventory_checkbox" }
-
-      before do
-        expect(track_inventory).to be_checked
-        track_inventory.set(false)
-        wait_for_ajax
-      end
-
-      it "persists the value when page reloaded" do
-        visit current_path
-        expect(track_inventory).not_to be_checked
-      end
-    end
-
-    # Regression test for #2896
-    # The regression was that unchecking the last checkbox caused a redirect
-    # to happen. By ensuring that we're still on an /admin/products URL, we
-    # assert that the redirect is *not* happening.
-    it "can toggle backorderable for the second variant stock item" do
-      new_location = create(:stock_location, name: "Another Location")
-      visit current_url
-
-      new_location_backorderable = find "#stock_item_backorderable_#{new_location.id}"
-      new_location_backorderable.set(false)
-      wait_for_ajax
-
-      expect(page.current_url).to include("/admin/products")
-    end
-
-    it "can create a new stock movement" do
-      fill_in "stock_movement_quantity", with: 5
-      select2 "default", from: "Stock Location"
-      click_button "Add Stock"
-
-      expect(page).to have_content('successfully created')
-
-      within(:css, '.stock_location_info table') do
-        expect(column_text(2)).to eq '15'
-      end
-    end
-
-    it "can create a new negative stock movement" do
-      fill_in "stock_movement_quantity", with: -5
-      select2 "default", from: "Stock Location"
-      click_button "Add Stock"
-
-      expect(page).to have_content('successfully created')
-
-      within(:css, '.stock_location_info table') do
-        expect(column_text(2)).to eq '5'
-      end
-    end
-
-    context "with multiple variants" do
-      let!(:variant) { create(:variant, product: product, sku: 'SPREEC') }
-      before do
-        variant.stock_items.first.update_column(:count_on_hand, 30)
-        visit current_url
-      end
-
-      it "can create a new stock movement for the specified variant" do
-        fill_in "stock_movement_quantity", with: 10
-        select2 "SPREEC", from: "Variant"
-        click_button "Add Stock"
-
-        expect(page).to have_content('successfully created')
-
-        within("#listing_product_stock tr", text: "SPREEC") do
-          within("table") do
-            expect(column_text(2)).to eq '40'
-          end
-        end
-      end
-    end
-
-    # Regression test for #3304
-    context "with no stock location" do
-      let(:product) { create(:product, name: 'apache baseball cap', price: 10) }
-      let(:variant) { create(:variant, product: product, sku: 'FOOBAR') }
-
-      before do
-        Spree::StockLocation.delete_all
-
-        visit spree.stock_admin_product_path(product)
-      end
-
-      it "redirects to stock locations page", js: false do
-        expect(page).to have_content(Spree.t(:stock_management_requires_a_stock_location))
-        expect(page.current_url).to include("admin/stock_locations")
-      end
-    end
-  end
-end

data/spec/features/admin/products/taxonomies_spec.rb

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe "Taxonomies", type: :feature, js: true do
-  stub_authorization!
-
-  before(:each) do
-    visit spree.admin_path
-    click_link "Products"
-  end
-
-  context "show" do
-    it 'should display existing taxonomies' do
-      create(:taxonomy, name: 'Brand')
-      create(:taxonomy, name: 'Categories')
-      visit spree.admin_taxonomies_path
-      within_row(1) { expect(page).to have_content('Brand') }
-      within_row(2) { expect(page).to have_content('Categories') }
-    end
-  end
-
-  context "create" do
-    before(:each) do
-      click_link "Taxonomies"
-      click_link "admin_new_taxonomy_link"
-    end
-
-    it "should allow an admin to create a new taxonomy" do
-      expect(page).to have_content("New Taxonomy")
-      fill_in "taxonomy_name", with: "sports"
-      click_button "Create"
-      expect(page).to have_content("successfully created!")
-    end
-
-    it "should display validation errors" do
-      fill_in "taxonomy_name", with: ""
-      click_button "Create"
-      expect(page).to have_content("can't be blank")
-    end
-  end
-
-  context "edit" do
-    it "should allow an admin to update an existing taxonomy" do
-      create(:taxonomy)
-      click_link "Taxonomies"
-      within_row(1) { click_icon :edit }
-      fill_in "taxonomy_name", with: "sports 99"
-      click_button "Update"
-      expect(page).to have_content("successfully updated!")
-      expect(page).to have_content("sports 99")
-    end
-  end
-end

data/spec/features/admin/products/variant_spec.rb

@@ -1,50 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe "Variants", type: :feature do
-  stub_authorization!
-
-  let(:product) { create(:product_with_option_types, price: "1.99", cost_price: "1.00", weight: "2.5", height: "3.0", width: "1.0", depth: "1.5") }
-
-  context "creating a new variant" do
-    it "should allow an admin to create a new variant", js: true do
-      product.options.each do |option|
-        create(:option_value, option_type: option.option_type)
-      end
-
-      visit spree.admin_products_path
-      within_row(1) { click_icon :edit }
-      click_link "Variants"
-      click_on "Add One"
-      expect(find('input#variant_price').value).to eq("1.99")
-      expect(find('input#variant_cost_price').value).to eq("1.00")
-      expect(find('input#variant_weight').value).to eq("2.50")
-      expect(find('input#variant_height').value).to eq("3.00")
-      expect(find('input#variant_width').value).to eq("1.00")
-      expect(find('input#variant_depth').value).to eq("1.50")
-      expect(page).to have_select('variant[tax_category_id]')
-    end
-  end
-
-  context "listing variants" do
-    context "currency displaying" do
-      context "using Russian Rubles" do
-        before do
-          Spree::Config[:currency] = "RUB"
-        end
-
-        let!(:variant) do
-          create(:variant, product: product, price: 19.99)
-        end
-
-        # Regression test for #2737
-        context "uses руб as the currency symbol" do
-          it "on the products listing page" do
-            visit spree.admin_product_variants_path(product)
-            within_row(1) { expect(page).to have_content("19.99 ₽") }
-          end
-        end
-      end
-    end
-  end
-end

data/spec/features/admin/promotions/adjustments_spec.rb

@@ -1,258 +0,0 @@
-require 'spec_helper'
-
-describe "Promotion Adjustments", type: :feature, js: true do
-  stub_authorization!
-
-  context "coupon promotions" do
-    before(:each) do
-      visit spree.admin_promotions_path
-      click_on "New Promotion"
-    end
-
-    it "should allow an admin to create a flat rate discount coupon promo" do
-      fill_in "Name", with: "Promotion"
-      fill_in "Code", with: "order"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-      expect(page).to have_content(promotion.name)
-
-      select2 "Item total", from: "Add rule of type"
-      within('#rule_fields') { click_button "Add" }
-
-      eventually_fill_in "promotion_promotion_rules_attributes_#{Spree::Promotion.count}_preferred_amount_min", with: 30
-      eventually_fill_in "promotion_promotion_rules_attributes_#{Spree::Promotion.count}_preferred_amount_max", with: 60
-      within('#rule_fields') { click_button "Update" }
-
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-
-      within('.calculator-fields') { fill_in "Amount", with: 5 }
-      within('#actions_container') { click_button "Update" }
-
-      expect(promotion.code).to eq("order")
-
-      first_rule = promotion.rules.first
-      expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
-      expect(first_rule.preferred_amount_min).to eq(30)
-      expect(first_rule.preferred_amount_max).to eq(60)
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::FlatRate)
-      expect(first_action_calculator.preferred_amount).to eq(5)
-    end
-
-    it "should allow an admin to create a single user coupon promo with flat rate discount" do
-      fill_in "Name", with: "Promotion"
-      fill_in "Usage Limit", with: "1"
-      fill_in "Code", with: "single_use"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-      expect(page).to have_content(promotion.name)
-
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('#action_fields') { fill_in "Amount", with: "5" }
-      within('#actions_container') { click_button "Update" }
-
-      expect(promotion.usage_limit).to eq(1)
-      expect(promotion.code).to eq("single_use")
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::FlatRate)
-      expect(first_action_calculator.preferred_amount).to eq(5)
-    end
-
-    it "should allow an admin to create an automatic promo with flat percent discount" do
-      fill_in "Name", with: "Promotion"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-
-      expect(page).to have_content(promotion.name)
-
-      select2 "Item total", from: "Add rule of type"
-      within('#rule_fields') { click_button "Add" }
-
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_min", with: 30
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_max", with: 60
-      within('#rule_fields') { click_button "Update" }
-
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Flat Percent", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Flat Percent", with: "10" }
-      within('#actions_container') { click_button "Update" }
-
-      expect(promotion.code).to be_blank
-
-      first_rule = promotion.rules.first
-      expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
-      expect(first_rule.preferred_amount_min).to eq(30)
-      expect(first_rule.preferred_amount_max).to eq(60)
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::FlatPercentItemTotal)
-      expect(first_action_calculator.preferred_flat_percent).to eq(10)
-    end
-
-    it "should allow an admin to create an product promo with percent per item discount" do
-      create(:product, name: "RoR Mug")
-
-      fill_in "Name", with: "Promotion"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-
-      expect(page).to have_content(promotion.name)
-
-      select2 "Product(s)", from: "Add rule of type"
-      within("#rule_fields") { click_button "Add" }
-      select2_search "RoR Mug", from: "Choose products"
-      within('#rule_fields') { click_button "Update" }
-
-      select2 "Create per-line-item adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Percent Per Item", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Percent", with: "10" }
-      within('#actions_container') { click_button "Update" }
-
-      expect(promotion.code).to be_blank
-
-      first_rule = promotion.rules.first
-      expect(first_rule.class).to eq(Spree::Promotion::Rules::Product)
-      expect(first_rule.products.map(&:name)).to include("RoR Mug")
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateItemAdjustments)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::PercentOnLineItem)
-      expect(first_action_calculator.preferred_percent).to eq(10)
-    end
-
-    it "should allow an admin to create an automatic promotion with free shipping (no code)" do
-      fill_in "Name", with: "Promotion"
-      click_button "Create"
-
-      promotion = Spree::Promotion.find_by_name("Promotion")
-      expect(page).to have_content(promotion.name)
-
-      select2 "Item total", from: "Add rule of type"
-      within('#rule_fields') { click_button "Add" }
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_min", with: "50"
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_max", with: "150"
-      within('#rule_fields') { click_button "Update" }
-
-      select2 "Free shipping", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      expect(page).to have_content("Makes all shipments for the order free")
-
-      expect(promotion.code).to be_blank
-
-      first_rule = promotion.rules.first
-      expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::FreeShipping)
-    end
-
-    it "should allow an admin to create an automatic promo requiring a landing page to be visited" do
-      fill_in "Name", with: "Promotion"
-      fill_in "Path", with: "content/cvv"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-
-      expect(page).to have_content(promotion.name)
-
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", with: "4" }
-      within('#actions_container') { click_button "Update" }
-
-      expect(promotion.path).to eq("content/cvv")
-      expect(promotion.code).to be_blank
-      expect(promotion.rules).to be_blank
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::FlatRate)
-      expect(first_action_calculator.preferred_amount).to eq(4)
-    end
-
-    it "should allow an admin to create a promotion that adds a 'free' item to the cart" do
-      create(:product, name: "RoR Mug")
-      fill_in "Name", with: "Promotion"
-      fill_in "Code", with: "complex"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-
-      expect(page).to have_content(promotion.name)
-
-      select2 "Create line items", from: "Add action of type"
-
-      within('#action_fields') { click_button "Add" }
-
-      page.find('.create_line_items .select2-choice').click
-      page.find('.select2-input').set('RoR Mug')
-      page.find('.select2-highlighted').click
-
-      within('#actions_container') { click_button "Update" }
-
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#new_promotion_action_form') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.create_adjustment .calculator-fields') { fill_in "Amount", with: "40.00" }
-      within('#actions_container') { click_button "Update" }
-
-      expect(promotion.code).to eq("complex")
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateLineItems)
-      line_item = expect(first_action.promotion_action_line_items).not_to be_empty
-    end
-
-    it "ceasing to be eligible for a promotion with item total rule then becoming eligible again" do
-      fill_in "Name", with: "Promotion"
-      click_button "Create"
-      promotion = Spree::Promotion.find_by_name("Promotion")
-
-      expect(page).to have_content(promotion.name)
-
-      select2 "Item total", from: "Add rule of type"
-      within('#rule_fields') { click_button "Add" }
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_min", with: "50"
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_max", with: "150"
-      within('#rule_fields') { click_button "Update" }
-
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", with: "5" }
-      within('#actions_container') { click_button "Update" }
-
-      first_rule = promotion.rules.first
-      expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
-      expect(first_rule.preferred_amount_min).to eq(50)
-      expect(first_rule.preferred_amount_max).to eq(150)
-
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      expect(first_action.calculator.class).to eq(Spree::Calculator::FlatRate)
-      expect(first_action.calculator.preferred_amount).to eq(5)
-    end
-  end
-end

data/spec/features/admin/promotions/option_value_rule_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-
-feature 'Promotion with option value rule' do
-  stub_authorization!
-
-  given(:variant) { create :variant }
-  given!(:product) { variant.product }
-  given!(:option_value) { variant.option_values.first }
-
-  given(:promotion) { create :promotion }
-
-  background do
-    visit spree.edit_admin_promotion_path(promotion)
-  end
-
-  scenario "adding an option value rule", js: true do
-    select2 "Option Value(s)", from: "Add rule of type"
-    within("#rule_fields") { click_button "Add" }
-
-    within("#rules .promotion-block") do
-      click_button "Add"
-
-      expect(page.body).to have_content("Product")
-      expect(page.body).to have_content("Option Values")
-    end
-
-    within('.promo-rule-option-value') do
-      targetted_select2_search product.name, from: '.js-promo-rule-option-value-product-select'
-      targetted_select2_search(
-        option_value.name,
-        from: '.js-promo-rule-option-value-option-values-select'
-      )
-    end
-
-    within('#rules_container') { click_button "Update" }
-
-    first_rule = promotion.rules.reload.first
-    expect(first_rule.class).to eq Spree::Promotion::Rules::OptionValue
-    expect(first_rule.preferred_eligible_values).to eq Hash[product.id => [option_value.id]]
-  end
-
-  context "with an existing option value rule" do
-    given(:variant1) { create :variant }
-    given(:variant2) { create :variant }
-    background do
-      rule = Spree::Promotion::Rules::OptionValue.new
-      rule.promotion = promotion
-      rule.preferred_eligible_values = Hash[
-        variant1.product_id => variant1.option_values.pluck(:id),
-        variant2.product_id => variant2.option_values.pluck(:id)
-      ]
-      rule.save!
-
-      visit spree.edit_admin_promotion_path(promotion)
-    end
-
-    scenario "deleting a product", js: true do
-      within(".promo-rule-option-value:last-child") do
-        find(".delete").click
-      end
-
-      within('#rule_fields') { click_button "Update" }
-
-      first_rule = promotion.rules.reload.first
-      expect(first_rule.preferred_eligible_values).to eq(
-        Hash[variant1.product_id => variant1.option_values.pluck(:id)]
-      )
-    end
-  end
-end