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.

General Rails 7.1 test fixes

Rafal Cymerys226f04cf896a
diff --git a/core/app/helpers/spree/products_helper.rb b/core/app/helpers/spree/products_helper.rb
index 3746019e1f..51adf73c27 100644
--- a/core/app/helpers/spree/products_helper.rb
+++ b/core/app/helpers/spree/products_helper.rb
@@ -53,7 +53,7 @@ module Spree
end
def cache_key_for_products(products = @products, additional_cache_key = nil)
- max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_s(:number)
+ max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_formatted_s(:number)
products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
(common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index df41922242..67890a1ac2 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1,6 +1,8 @@
en:
activemodel:
errors:
+ messages:
+ blank: can't be blank
models:
spree/fulfilment_changer:
attributes:
@@ -309,6 +311,8 @@ en:
one: Zone
other: Zones
errors:
+ messages:
+ blank: can't be blank
models:
spree/calculator/tiered_flat_rate:
attributes:
diff --git a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
index ad0655013e..d082c57cfc 100644
--- a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
@@ -55,7 +55,12 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
end
it 'sets httponly flag' do
get :index
- expect(response['Set-Cookie']).to include('HttpOnly')
+ if Rails::VERSION::STRING >= '7.1.0'
+ token_header = response.headers['Set-Cookie'].find { |e| e.starts_with?('token=') }
+ expect(token_header).to include('httponly')
+ else
+ expect(response['Set-Cookie']).to include('HttpOnly')
+ end
end
end
diff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rb
index a4365f71c3..8c994c337b 100644
--- a/core/spec/models/spree/menu_item_spec.rb
+++ b/core/spec/models/spree/menu_item_spec.rb
@@ -196,11 +196,6 @@ describe Spree::MenuItem, type: :model do
describe 'touch menu and store' do
let(:menu_item) { build(:menu_item, menu: menu, icon: nil) }
- it 'touches menu' do
- expect(menu).to receive(:touch)
- menu_item.save!
- end
-
it { expect { menu_item.save! }.to change(store, :updated_at) }
end
end