From 333a488dc81e9aa19c3910f62072db66c021bf3a Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 12 Mar 2021 22:34:33 +0000 Subject: [PATCH] Fix deprecation warning --- app/models/spree/product.rb | 2 +- spec/models/spree/product_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/spree/product.rb b/app/models/spree/product.rb index bb42d78b43..140a508af7 100755 --- a/app/models/spree/product.rb +++ b/app/models/spree/product.rb @@ -52,7 +52,7 @@ module Spree dependent: :destroy has_many :variants, -> { - where(is_master: false).order("#{::Spree::Variant.quoted_table_name}.position ASC") + where(is_master: false).order("spree_variants.position ASC") }, class_name: 'Spree::Variant' has_many :variants_including_master, diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb index c1da45eddc..c3814bebf8 100644 --- a/spec/models/spree/product_spec.rb +++ b/spec/models/spree/product_spec.rb @@ -88,13 +88,13 @@ module Spree describe 'Variants sorting' do context 'without master variant' do it 'sorts variants by position' do - expect(product.variants.to_sql).to match(/ORDER BY (\`|\")spree_variants(\`|\").position ASC/) + expect(product.variants.to_sql).to match(/ORDER BY spree_variants.position ASC/) end end context 'with master variant' do it 'sorts variants by position' do - expect(product.variants_including_master.to_sql).to match(/ORDER BY (\`|\")spree_variants(\`|\").position ASC/) + expect(product.variants_including_master.to_sql).to match(/ORDER BY spree_variants.position ASC/) end end end