Fix failing specs [OFN-12666]

openfoodfoundation · Jul 23, 2024 · fb29bb2 · fb29bb2
1 parent 8d2ca2f
commit fb29bb2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -139,7 +139,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       on_hand: null
       price: null
       tax_category_id: null
-      category_id: newVariantCategoryId
+      category_id: null
     DisplayProperties.setShowVariants product.id, true
     DirtyProducts.addVariantProperty(product.id, newVariantId, 'category_id', newVariantCategoryId)
 

diff --git a/spec/services/sets/product_set_spec.rb b/spec/services/sets/product_set_spec.rb
@@ -304,7 +304,10 @@
           [
             { id: product.variants.first.id.to_s }, # default variant unchanged
             # omit ID for new variant
-            { sku: "new sku", price: "5.00", unit_value: "5", supplier_id: supplier.id },
+            {
+              sku: "new sku", price: "5.00", unit_value: "5",
+              supplier_id: supplier.id, primary_taxon_id: create(:taxon).id
+            },
           ]
         }
         let(:supplier) { create(:supplier_enterprise) }

diff --git a/spec/system/admin/products_v3/actions_spec.rb b/spec/system/admin/products_v3/actions_spec.rb
@@ -15,8 +15,8 @@
     login_as user
   end
 
-  let(:producer_search_selector) { 'input[placeholder="Search for producers"]' }
-  let(:categories_search_selector) { 'input[placeholder="Search for categories"]' }
+  let(:producer_search_selector) { 'input[placeholder="Select producer"]' }
+  let(:categories_search_selector) { 'input[placeholder="Select category"]' }
   let(:tax_categories_search_selector) { 'input[placeholder="Search for tax categories"]' }
 
   describe "with no products" do
@@ -520,6 +520,7 @@ def expect_other_columns_visible
         expect(page).to have_select(
           '_products_0_variants_attributes_0_supplier_id',
           options: [
+            'Select producer',
             supplier_managed1.name, supplier_managed2.name, supplier_permitted.name
           ], selected: supplier_managed1.name
         )
@@ -529,6 +530,7 @@ def expect_other_columns_visible
         expect(page).to have_select(
           '_products_1_variants_attributes_0_supplier_id',
           options: [
+            'Select producer',
             supplier_managed1.name, supplier_managed2.name, supplier_permitted.name
           ], selected: supplier_permitted.name
         )

diff --git a/spec/system/admin/products_v3/create_spec.rb b/spec/system/admin/products_v3/create_spec.rb
@@ -6,12 +6,13 @@
   include AuthenticationHelper
   include WebHelper
 
+  let!(:supplier) { create(:supplier_enterprise) }
+  let!(:taxon) { create(:taxon) }
+
   describe "creating a new product" do
     let!(:stock_location) { create(:stock_location, backorderable_default: false) }
-    let!(:supplier) { create(:supplier_enterprise) }
     let!(:distributor) { create(:distributor_enterprise) }
     let!(:shipping_category) { create(:shipping_category) }
-    let!(:taxon) { create(:taxon) }
 
     before { visit_products_page_as_admin }
 
@@ -81,6 +82,10 @@
           find('input[id$="_display_as"]').fill_in with: "2 grams"
           find('button[aria-label="On Hand"]').click
           find('input[id$="_price"]').fill_in with: "11.1"
+
+          select supplier.name, from: 'Producer'
+          select taxon.name, from: 'Category'
+
           if stock == "on_hand"
             find('input[id$="_on_hand"]').fill_in with: "66"
           elsif stock == "on_demand"