From 99301e1fb239021d3ba51f0c2c2809c3f0a7aa14 Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Fri, 6 Nov 2020 12:49:07 -0800
Subject: [PATCH 1/2] fix #6304

---
 app/views/spree/admin/products/edit.html.haml | 2 ++
 app/views/spree/admin/products/new.html.haml  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/views/spree/admin/products/edit.html.haml b/app/views/spree/admin/products/edit.html.haml
index 70dad9be28..7a9a3e1670 100644
--- a/app/views/spree/admin/products/edit.html.haml
+++ b/app/views/spree/admin/products/edit.html.haml
@@ -1,3 +1,5 @@
+= admin_inject_available_units
+
 - content_for :page_actions do
   %li= button_link_to t('admin.products.back_to_products_list'), "#{admin_products_path}#{(@url_filters.empty? ? "" : "#?#{@url_filters.to_query}")}", :icon => 'icon-arrow-left'
   %li#new_product_link
diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml
index 11a61a2168..b28ff02c32 100644
--- a/app/views/spree/admin/products/new.html.haml
+++ b/app/views/spree/admin/products/new.html.haml
@@ -1,5 +1,7 @@
 = render :partial => 'spree/admin/shared/product_sub_menu'
 = render :partial => 'spree/shared/error_messages', :locals => { :target => @product }
+= admin_inject_available_units
+
 = form_for [:admin, @product], :html => { :multipart => true } do |f|
   .twelve.columns.alpha
     %fieldset.no-border-bottom{ id: "new_product" }

From d5037abbe7c88c05e67f37c884eb19bd7e43fc0a Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Tue, 10 Nov 2020 10:49:14 -0800
Subject: [PATCH 2/2] add specs for new/edit product pages

---
 spec/features/admin/products_spec.rb | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 5e4abbc310..1549983e45 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -66,6 +66,28 @@ feature '
       expect(product.master.options_text).to eq("5kg")
     end
 
+    scenario "creating directly from the new product path", js: true do
+      login_as_admin_and_visit spree.new_admin_product_path
+
+      select 'New supplier', from: 'product_supplier_id'
+      fill_in 'product_name', with: 'A new product !!!'
+      select "Weight (kg)", from: 'product_variant_unit_with_scale'
+      fill_in 'product_unit_value_with_description', with: 5
+      select taxon.name, from: "product_primary_taxon_id"
+      fill_in 'product_price', with: '19.99'
+      fill_in 'product_on_hand', with: 5
+      select 'Test Tax Category', from: 'product_tax_category_id'
+      page.find("div[id^='taTextElement']").native.send_keys('A description...')
+
+      click_button 'Create'
+
+      expect(current_path).to eq spree.admin_products_path
+      expect(flash_message).to eq('Product "A new product !!!" has been successfully created!')
+      product = Spree::Product.find_by(name: 'A new product !!!')
+      expect(product.variant_unit).to eq('weight')
+      expect(product.variant_unit_scale).to eq(1000)
+    end
+
     scenario "creating an on-demand product", js: true do
       login_as_admin_and_visit spree.admin_products_path
 
@@ -446,5 +468,17 @@ feature '
       uri = URI.parse(current_url)
       expect("#{uri.path}?#{uri.query}").to eq spree.admin_product_images_path(product, filter)
     end
+
+    scenario "editing a product's variant unit scale", js: true do
+      product = create(:simple_product, name: 'a product', supplier: @supplier2)
+
+      visit spree.edit_admin_product_path product
+      select 'Weight (kg)', from: 'product_variant_unit_with_scale'
+      click_button 'Update'
+      expect(flash_message).to eq('Product "a product" has been successfully updated!')
+      product.reload
+      expect(product.variant_unit).to eq('weight')
+      expect(product.variant_unit_scale).to eq(1000)
+    end
   end
 end