From 9a267ace748f21deb5d27695dc28f4659fa033fd Mon Sep 17 00:00:00 2001 From: Zog Date: Sun, 29 Apr 2018 10:37:27 +0200 Subject: Fix specs --- app/policies/referential_policy.rb | 2 +- spec/support/pundit/shared_examples.rb | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/policies/referential_policy.rb b/app/policies/referential_policy.rb index 14f81cf5c..4b8b40b36 100644 --- a/app/policies/referential_policy.rb +++ b/app/policies/referential_policy.rb @@ -34,7 +34,7 @@ class ReferentialPolicy < ApplicationPolicy end def unarchive? - !referential_read_only? && record.archived? && !record.merged? && organisation_match? && user.has_permission?('referentials.update') + record.ready? && record.archived? && !record.merged? && organisation_match? && user.has_permission?('referentials.update') end def common_lines? diff --git a/spec/support/pundit/shared_examples.rb b/spec/support/pundit/shared_examples.rb index 8592ef29f..0ac1d3503 100644 --- a/spec/support/pundit/shared_examples.rb +++ b/spec/support/pundit/shared_examples.rb @@ -111,10 +111,8 @@ RSpec.shared_examples 'permitted policy and same organisation' do if archived_and_finalised it 'removes the permission for archived referentials' do user.organisation_id = referential.organisation_id - record.archived_at = 42.seconds.ago - record.ready = true - expect(record).to be_archived - expect(record).to be_referential_read_only + referential.archived_at = 42.seconds.ago + referential.ready = true expect_it.not_to permit(user_context, record) end -- cgit v1.2.3