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.

Improves Storefront's Policies controller (#12609)

Damian Legawiecbab51cb0660b
diff --git a/storefront/app/controllers/spree/policies_controller.rb b/storefront/app/controllers/spree/policies_controller.rb
index 0ce59103ef..335086e07b 100644
--- a/storefront/app/controllers/spree/policies_controller.rb
+++ b/storefront/app/controllers/spree/policies_controller.rb
@@ -2,7 +2,16 @@ module Spree
class PoliciesController < StoreController
def show
if params[:id].in?(supported_policies)
- @policy = current_store.send("customer_#{params[:id]}")
+ @policy = case params[:id]
+ when 'privacy_policy'
+ current_store.customer_privacy_policy
+ when 'terms_of_service'
+ current_store.customer_terms_of_service
+ when 'returns_policy'
+ current_store.customer_returns_policy
+ when 'shipping_policy'
+ current_store.customer_shipping_policy
+ end
else
raise ActiveRecord::RecordNotFound
end
diff --git a/storefront/spec/controllers/spree/policies_controller_spec.rb b/storefront/spec/controllers/spree/policies_controller_spec.rb
new file mode 100644
index 0000000000..cfcc8f599f
--- /dev/null
+++ b/storefront/spec/controllers/spree/policies_controller_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Spree::PoliciesController, type: :controller do
+ let(:store) { @default_store }
+
+ render_views
+
+ before do
+ allow(controller).to receive(:current_store).and_return(store)
+ end
+
+ describe 'GET #show' do
+ context 'with valid policy types' do
+ it 'renders privacy_policy' do
+ get :show, params: { id: 'privacy_policy' }
+ expect(assigns(:policy)).to eq(store.customer_privacy_policy)
+ expect(response).to render_template(:show)
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'renders terms_of_service' do
+ get :show, params: { id: 'terms_of_service' }
+ expect(assigns(:policy)).to eq(store.customer_terms_of_service)
+ expect(response).to render_template(:show)
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'renders returns_policy' do
+ get :show, params: { id: 'returns_policy' }
+ expect(assigns(:policy)).to eq(store.customer_returns_policy)
+ expect(response).to render_template(:show)
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'renders shipping_policy' do
+ get :show, params: { id: 'shipping_policy' }
+ expect(assigns(:policy)).to eq(store.customer_shipping_policy)
+ expect(response).to render_template(:show)
+ expect(response).to have_http_status(:ok)
+ end
+ end
+
+ context 'with invalid policy type' do
+ it 'raises RecordNotFound error' do
+ expect {
+ get :show, params: { id: 'invalid_policy' }
+ }.to raise_error(ActiveRecord::RecordNotFound)
+ end
+ end
+ end
+end