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 setting the policy owner (#13088)

Łukasz Adamczykf5d8b18e87a0
diff --git a/admin/app/controllers/spree/admin/policies_controller.rb b/admin/app/controllers/spree/admin/policies_controller.rb
index 0bc2fbdd60..e859dccf92 100644
--- a/admin/app/controllers/spree/admin/policies_controller.rb
+++ b/admin/app/controllers/spree/admin/policies_controller.rb
@@ -3,6 +3,8 @@ module Spree
class PoliciesController < ResourceController
add_breadcrumb Spree.t(:policies), :admin_policies_path
+ before_action :set_policy_owner, only: %i[create update]
+
private
def collection
@@ -20,6 +22,10 @@ module Spree
def update_turbo_stream_enabled?
true
end
+
+ def set_policy_owner
+ @policy.owner ||= current_store
+ end
end
end
end
diff --git a/admin/spec/controllers/spree/admin/policies_controller_spec.rb b/admin/spec/controllers/spree/admin/policies_controller_spec.rb
index 002e7e50a4..9e451a6946 100644
--- a/admin/spec/controllers/spree/admin/policies_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/policies_controller_spec.rb
@@ -31,9 +31,9 @@ RSpec.describe Spree::Admin::PoliciesController, type: :controller do
let(:policy_params) do
{
- name: 'Privacy Policy',
+ name: 'New Privacy Policy',
body: 'This is our privacy policy content',
- slug: 'privacy-policy'
+ slug: 'new-privacy-policy'
}
end
@@ -41,9 +41,27 @@ RSpec.describe Spree::Admin::PoliciesController, type: :controller do
expect { create_policy }.to change(Spree::Policy, :count).by(1)
policy = Spree::Policy.last
- expect(policy.name).to eq('Privacy Policy')
+ expect(policy.name).to eq('New Privacy Policy')
expect(policy.body.to_plain_text).to eq('This is our privacy policy content')
- expect(policy.slug).to eq('privacy-policy')
+ expect(policy.slug).to eq('new-privacy-policy')
+ expect(policy.owner).to eq(store)
+ end
+
+ context 'when manually passing owner params' do
+ let(:policy_params) do
+ {
+ name: 'New Privacy Policy',
+ body: 'This is our privacy policy content',
+ slug: 'new-privacy-policy',
+ owner_id: 123,
+ owner_type: 'Spree::User'
+ }
+ end
+
+ it 'ignores the given owner params' do
+ expect { create_policy }.to change(Spree::Policy, :count).by(1)
+ expect(Spree::Policy.last.owner).to eq(store)
+ end
end
end
@@ -77,6 +95,7 @@ RSpec.describe Spree::Admin::PoliciesController, type: :controller do
expect(policy.name).to eq('Updated Privacy Policy')
expect(policy.body.to_plain_text).to eq('This is updated privacy policy content')
expect(policy.slug).to eq('updated-privacy-policy')
+ expect(policy.owner).to eq(store)
end
end
diff --git a/core/app/models/spree/policy.rb b/core/app/models/spree/policy.rb
index e3741ad5ed..7b11da24e8 100644
--- a/core/app/models/spree/policy.rb
+++ b/core/app/models/spree/policy.rb
@@ -31,6 +31,7 @@ module Spree
#
validates :slug, presence: true, uniqueness: { scope: UNIQUENESS_SCOPE }
validates :name, presence: true
+ validates :owner, presence: true
#
# Scopes
diff --git a/core/spec/models/spree/policy_spec.rb b/core/spec/models/spree/policy_spec.rb
index a05f401036..77941e75d0 100644
--- a/core/spec/models/spree/policy_spec.rb
+++ b/core/spec/models/spree/policy_spec.rb
@@ -14,6 +14,13 @@ RSpec.describe Spree::Policy, type: :model do
expect(other_policy.slug).to eq(policy.slug)
end
end
+
+ context 'owner presence' do
+ it 'is invalid without an owner' do
+ policy.owner = nil
+ expect(policy).to be_invalid
+ end
+ end
end
describe 'friendly_id' do