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 flaky permission tests (#14083)

Damian Legawiec32c257dd3bd5
diff --git a/spree/core/lib/spree/core/permission_configuration.rb b/spree/core/lib/spree/core/permission_configuration.rb
index 09f3996a43..308530f887 100644
--- a/spree/core/lib/spree/core/permission_configuration.rb
+++ b/spree/core/lib/spree/core/permission_configuration.rb
@@ -105,6 +105,21 @@ module Spree
@role_permissions = {}
end
+ # Returns a deep copy of this configuration. Useful for snapshotting
+ # state before a test mutates it; restore with {#replace}.
+ def dup
+ copy = super
+ copy.instance_variable_set(:@role_permissions, @role_permissions.deep_dup)
+ copy
+ end
+
+ # Replaces this configuration's state with a deep copy of `other`'s.
+ # Pair with {#dup} to snapshot/restore around code that mutates the
+ # global Spree.permissions config.
+ def replace(other)
+ @role_permissions = other.instance_variable_get(:@role_permissions).deep_dup
+ end
+
private
def normalize_role_name(role_name)
diff --git a/spree/core/spec/models/spree/ability_spec.rb b/spree/core/spec/models/spree/ability_spec.rb
index 41c29df1f3..925a8faa4e 100644
--- a/spree/core/spec/models/spree/ability_spec.rb
+++ b/spree/core/spec/models/spree/ability_spec.rb
@@ -8,12 +8,6 @@ describe Spree::Ability, type: :model do
let(:ability) { Spree::Ability.new(user) }
let(:token) { nil }
- before do
- # Ensure permission sets are configured (may have been reset by other specs)
- Spree.permissions.assign(:default, [Spree::PermissionSets::DefaultCustomer])
- Spree.permissions.assign(:admin, [Spree::PermissionSets::SuperUser])
- end
-
context 'for general resource' do
let(:resource) { Object.new }
diff --git a/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb b/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb
index 978f87bf39..f1b3a6006f 100644
--- a/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb
+++ b/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb
@@ -4,14 +4,15 @@ require 'cancan/matchers'
RSpec.describe 'Permission Sets Integration with Ability', type: :model do
let(:store) { @default_store }
- before do
- # Reset permissions before each test
- Spree.permissions.reset!
- end
-
- after do
- # Reset permissions after each test
+ # These specs configure Spree.permissions from scratch to assert exact role
+ # resolution, but the config is global — leaving it empty would strip admins
+ # of `accessible_by(:manage)` in every spec that runs after this file.
+ around do |example|
+ saved = Spree.permissions.dup
Spree.permissions.reset!
+ example.run
+ ensure
+ Spree.permissions.replace(saved)
end
describe 'role-based permissions' do