From 4109fbde7002c872fd34aa8f20665c19f3468e67 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Tue, 2 Jul 2024 15:28:31 +1000 Subject: [PATCH] Fix variant controller spec --- lib/open_food_network/scope_variants_for_search.rb | 2 +- spec/controllers/spree/admin/variants_controller_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/open_food_network/scope_variants_for_search.rb b/lib/open_food_network/scope_variants_for_search.rb index e154096524..7c51cd8b61 100644 --- a/lib/open_food_network/scope_variants_for_search.rb +++ b/lib/open_food_network/scope_variants_for_search.rb @@ -36,7 +36,7 @@ module OpenFoodNetwork Spree::Variant. ransack(search_params.merge(m: 'or')). result. - order("spree_products.name, display_name, display_as, spree_products.variant_unit_name"). + order("spree_products.name, display_name, display_as, spree_variants.variant_unit_name"). includes(:product). joins(:product) end diff --git a/spec/controllers/spree/admin/variants_controller_spec.rb b/spec/controllers/spree/admin/variants_controller_spec.rb index ba6e1542e5..a443e4d449 100644 --- a/spec/controllers/spree/admin/variants_controller_spec.rb +++ b/spec/controllers/spree/admin/variants_controller_spec.rb @@ -12,8 +12,8 @@ module Spree let(:product) { create(:product, name: 'Product A') } let(:deleted_variant) do deleted_variant = product.variants.create( - unit_value: "2", price: 1, primary_taxon: create(:taxon), - supplier: create(:supplier_enterprise) + unit_value: "2", variant_unit: "weight", variant_unit_scale: 1, price: 1, + primary_taxon: create(:taxon), supplier: create(:supplier_enterprise) ) deleted_variant.delete deleted_variant