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.

Fixed deprecations running custom ability rules (#13879)

Damian Legawieca2eb0929609b
diff --git a/spree/core/lib/spree/core/permission_configuration.rb b/spree/core/lib/spree/core/permission_configuration.rb
index 645fc996ac..09f3996a43 100644
--- a/spree/core/lib/spree/core/permission_configuration.rb
+++ b/spree/core/lib/spree/core/permission_configuration.rb
@@ -45,6 +45,18 @@ module Spree
@role_permissions[role_key] |= Array(permission_sets)
end
+ # Removes specific permission set(s) from a role.
+ #
+ # @param role_name [Symbol, String] the name of the role
+ # @param permission_sets [Array<Class>, Class] permission set class(es) to remove
+ # @return [Array<Class>] the remaining permission sets
+ def unassign(role_name, permission_sets)
+ role_key = normalize_role_name(role_name)
+ return [] unless @role_permissions[role_key]
+
+ @role_permissions[role_key] -= Array(permission_sets)
+ end
+
# Clears all permission sets from a role.
#
# @param role_name [Symbol, String] the name of the role
diff --git a/spree/core/lib/spree/testing_support/authorization_helpers.rb b/spree/core/lib/spree/testing_support/authorization_helpers.rb
index 52b6a69e61..0cb6ba5269 100644
--- a/spree/core/lib/spree/testing_support/authorization_helpers.rb
+++ b/spree/core/lib/spree/testing_support/authorization_helpers.rb
@@ -2,11 +2,12 @@ module Spree
module TestingSupport
module AuthorizationHelpers
module CustomAbility
- def build_ability(&block)
+ def build_permission_set(&block)
block ||= proc { |_u| can :manage, :all }
- Class.new do
- include CanCan::Ability
- define_method(:initialize, block)
+ Class.new(Spree::PermissionSets::Base) do
+ define_method(:activate!) do
+ instance_exec(user, &block)
+ end
end
end
end
@@ -29,15 +30,14 @@ module Spree
include CustomAbility
def stub_authorization!
- ability = build_ability
- ability_class = Spree.ability_class
+ permission_set = build_permission_set
- after(:all) do
- ability_class.remove_ability(ability)
+ before(:all) do
+ Spree.permissions.assign(:admin, permission_set)
end
- before(:all) do
- ability_class.register_ability(ability)
+ after(:all) do
+ Spree.permissions.unassign(:admin, permission_set)
end
let(:admin_user) { FactoryBot.create(:admin_user) }
@@ -50,14 +50,14 @@ module Spree
end
def custom_authorization!(&block)
- ability = build_ability(&block)
- ability_class = Spree.ability_class
+ permission_set = build_permission_set(&block)
- after(:all) do
- ability_class.remove_ability(ability)
- end
before(:all) do
- ability_class.register_ability(ability)
+ Spree.permissions.assign(:admin, permission_set)
+ end
+
+ after(:all) do
+ Spree.permissions.unassign(:admin, permission_set)
end
end
end
diff --git a/spree/core/spec/lib/spree/core/permission_configuration_spec.rb b/spree/core/spec/lib/spree/core/permission_configuration_spec.rb
index 45a299ad15..44848dbcaa 100644
--- a/spree/core/spec/lib/spree/core/permission_configuration_spec.rb
+++ b/spree/core/spec/lib/spree/core/permission_configuration_spec.rb
@@ -42,6 +42,33 @@ RSpec.describe Spree::PermissionConfiguration do
end
end
+ describe '#unassign' do
+ it 'removes a specific permission set from a role' do
+ config.assign(:customer_service, [permission_set_a, permission_set_b])
+ config.unassign(:customer_service, permission_set_a)
+
+ expect(config.permission_sets_for(:customer_service)).to contain_exactly(permission_set_b)
+ end
+
+ it 'removes multiple permission sets from a role' do
+ config.assign(:customer_service, [permission_set_a, permission_set_b, permission_set_c])
+ config.unassign(:customer_service, [permission_set_a, permission_set_c])
+
+ expect(config.permission_sets_for(:customer_service)).to contain_exactly(permission_set_b)
+ end
+
+ it 'returns an empty array for non-existent roles' do
+ expect(config.unassign(:nonexistent, permission_set_a)).to eq([])
+ end
+
+ it 'normalizes role names' do
+ config.assign(:customer_service, [permission_set_a, permission_set_b])
+ config.unassign('Customer_Service', permission_set_a)
+
+ expect(config.permission_sets_for(:customer_service)).to contain_exactly(permission_set_b)
+ end
+ end
+
describe '#clear' do
it 'removes all permission sets from a role' do
config.assign(:customer_service, [permission_set_a, permission_set_b])