Fix failing specs [OFN-12666]

openfoodfoundation · Jul 24, 2024 · a7ca6f3 · a7ca6f3
1 parent 1c865af
commit a7ca6f3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/spec/javascripts/unit/admin/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/admin/bulk_product_update_spec.js.coffee
@@ -797,14 +797,20 @@ describe "AdminProductEditCtrl", ->
       spyOn DisplayProperties, 'setShowVariants'
 
     it "adds first and subsequent variants", ->
-      product = {id: 123, variants: []}
+      product = {id: 123, variants: [
+        { 
+          id: 1, price: 10.0, unit_value: 1, tax_category_id: null, unit_description: '1kg',
+          on_demand: false, on_hand: null, display_as: null, display_name: null, category_id: 2
+        }
+      ]}
       $scope.addVariant(product)
       $scope.addVariant(product)
       expect(product).toEqual
         id: 123
         variants: [
-          {id: -1, price: null, unit_value: null, tax_category_id: null, unit_description: null, on_demand: false, on_hand: null, display_as: null, display_name: null, category_id: null}
-          {id: -2, price: null, unit_value: null, tax_category_id: null, unit_description: null, on_demand: false, on_hand: null, display_as: null, display_name: null, category_id: null}
+          {id: 1, price: 10.0, unit_value: 1, tax_category_id: null, unit_description: '1kg', on_demand: false, on_hand: null, display_as: null, display_name: null, category_id: 2}
+          {id: -1, price: null, unit_value: null, tax_category_id: null, unit_description: null, on_demand: false, on_hand: null, display_as: null, display_name: null, category_id: 2}
+          {id: -2, price: null, unit_value: null, tax_category_id: null, unit_description: null, on_demand: false, on_hand: null, display_as: null, display_name: null, category_id: 2}
         ]
 
     it "shows the variant(s)", ->

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"