From 04d50d455502405f59092ca4b0c4360ab2dce056 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 31 Aug 2018 15:00:29 +0100 Subject: [PATCH] Fix filter results bug in validation section --- .../admin/product_import/filters/filter_entries.js.coffee | 2 +- spec/features/admin/product_import_spec.rb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee b/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee index 4a1007b3a9..efbcf5652b 100644 --- a/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee +++ b/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee @@ -10,7 +10,7 @@ angular.module("admin.productImport").filter 'entriesFilterValid', -> if type == 'valid' and validates_as != '' \ or type == 'invalid' and validates_as == '' \ - or type == 'create_product' and validates_as == 'new_product' or validates_as == 'new_variant' \ + or type == 'create_product' and (validates_as == 'new_product' or validates_as == 'new_variant') \ or type == 'update_product' and validates_as == 'existing_variant' \ or type == 'create_inventory' and validates_as == 'new_inventory_item' \ or type == 'update_inventory' and validates_as == 'existing_inventory_item' diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb index 31477f1338..be6c01810c 100644 --- a/spec/features/admin/product_import_spec.rb +++ b/spec/features/admin/product_import_spec.rb @@ -201,11 +201,12 @@ feature "Product Import", js: true do expect(Spree::Product.find_by_name('Beans').on_hand).to eq 0 end - it "can save a new product and variant of that product at the same time" do + it "can save a new product and variant of that product at the same time, add variant to existing product" do csv_data = CSV.generate do |csv| csv << ["name", "supplier", "category", "on_hand", "price", "units", "unit_type", "display_name"] csv << ["Potatoes", "User Enterprise", "Vegetables", "5", "3.50", "500", "g", "Small Bag"] csv << ["Potatoes", "User Enterprise", "Vegetables", "6", "5.50", "2", "kg", "Big Bag"] + csv << ["Beans", "User Enterprise", "Vegetables", "7", "2.50", "250", "g", nil] end File.write('/tmp/test.csv', csv_data) @@ -215,9 +216,9 @@ feature "Product Import", js: true do import_data - expect(page).to have_selector '.item-count', text: "2" + expect(page).to have_selector '.item-count', text: "3" expect(page).to_not have_selector '.invalid-count' - expect(page).to have_selector '.create-count', text: "2" + expect(page).to have_selector '.create-count', text: "3" expect(page).to_not have_selector '.update-count' expect(page).to_not have_selector '.update-count' expect(page).to_not have_selector '.inv-create-count'