Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Return none from Order.search for non-string queries (#15065)

Damian Legawiec6f0dc185b253
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index 880a94cbca..ce772d033e 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -337,8 +337,10 @@ module Spree
scope :reverse_chronological, -> { order(Arel.sql('spree_orders.completed_at IS NULL'), completed_at: :desc, created_at: :desc) }
def self.search(query)
+ # Ransack passes `true` when the scope is called as a bare flag (`q[search]=1`)
+ return none unless query.is_a?(String) && query.present?
+
sanitized_query = sanitize_query_for_search(query)
- return none if query.blank?
query_pattern = "%#{sanitized_query}%"
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index f1bdfce1dc..c2f790c9cf 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -86,6 +86,11 @@ describe Spree::Order, type: :model do
let!(:order_4) { create(:order, number: 'R300', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Ayn', last_name: 'Rand')) }
let!(:order_5) { create(:order, number: 'R400', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'John', last_name: 'Doe')) }
+ it 'returns no orders for a non-string query' do
+ expect(described_class.search(true)).to be_empty
+ expect(described_class.search(nil)).to be_empty
+ end
+
it 'returns orders based on an email' do
expect(described_class.search('[email protected]')).to eq([order_1])
expect(described_class.search('[email protected]')).to eq([order_2])