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.

Fix test for taxon edit.

Matthew Kennedyc254e3e69f47
diff --git a/backend/app/controllers/spree/admin/orders_controller.rb b/backend/app/controllers/spree/admin/orders_controller.rb
index b0d5798977..fc4d52e688 100644
--- a/backend/app/controllers/spree/admin/orders_controller.rb
+++ b/backend/app/controllers/spree/admin/orders_controller.rb
@@ -45,7 +45,7 @@ module Spree
params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
end
- @search = if params[:q][:all_stores] == '1'
+ @search = if params[:q][:all_stores] == '1' || !current_store.present?
Spree::Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
else
scope.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
diff --git a/backend/app/controllers/spree/admin/products_controller.rb b/backend/app/controllers/spree/admin/products_controller.rb
index 9ff705f69c..55332ded8c 100644
--- a/backend/app/controllers/spree/admin/products_controller.rb
+++ b/backend/app/controllers/spree/admin/products_controller.rb
@@ -96,7 +96,7 @@ module Spree
end
def find_resource
- Spree::Product.with_deleted.friendly.find(params[:id])
+ Product.with_deleted.friendly.find(params[:id])
end
def location_after_save
diff --git a/backend/spec/features/admin/orders/risk_analysis_spec.rb b/backend/spec/features/admin/orders/risk_analysis_spec.rb
index 6eb148cb42..b1a072fdb1 100644
--- a/backend/spec/features/admin/orders/risk_analysis_spec.rb
+++ b/backend/spec/features/admin/orders/risk_analysis_spec.rb
@@ -17,12 +17,6 @@ describe 'Order Risk Analysis', type: :feature do
context 'the order is considered risky' do
before do
- order_store = Spree::Store.find(order.store_id)
-
- order_store.update!(default: true)
- order_store.save!
- order_store.reload
-
allow_any_instance_of(Spree::Admin::BaseController).to receive_messages try_spree_current_user: create(:user)
order.payments.first.update_column(:avs_response, 'X')
diff --git a/backend/spec/features/admin/products/edit/taxons_spec.rb b/backend/spec/features/admin/products/edit/taxons_spec.rb
index ecc5d654a6..f71e73af6d 100644
--- a/backend/spec/features/admin/products/edit/taxons_spec.rb
+++ b/backend/spec/features/admin/products/edit/taxons_spec.rb
@@ -15,7 +15,9 @@ describe 'Product Taxons', type: :feature, js: true do
expect(page).to have_css('.select2-selection__choice', text: "#{taxon_1.parent.name} -> #{taxon_1.name}")
+ select2_open css: '#product_taxons_field'
select2_open label: 'Taxons'
+
select2_search 'Clothing', from: 'Taxons'
select2_select 'Clothing', from: 'Taxons', match: :first
wait_for { !page.has_button?('Update') }