Refs: #3446; hotfix

5 files changed, 22 insertions, 22 deletions

diff --git a/spec/policies/line_policy_spec.rb b/spec/policies/line_policy_spec.rb
index eb84bacc7..ead5918aa 100644
--- a/spec/policies/line_policy_spec.rb
+++ b/spec/policies/line_policy_spec.rb
@@ -3,16 +3,16 @@ RSpec.describe LinePolicy, type: :policy do
   %w{create destroy edit}.each do | permission |
     footnote_permission = "#{permission}_footnote"
     permissions "#{footnote_permission}?".to_sym do
-      it_behaves_like 'permitted policy', "footnotes.#{permission}", restricted_ready: true
+      it_behaves_like 'permitted policy', "footnotes.#{permission}", archived: true
     end
   end
 
   permissions :new_footnote? do
-    it_behaves_like 'permitted policy', 'footnotes.create', restricted_ready: true
+    it_behaves_like 'permitted policy', 'footnotes.create', archived: true
   end
 
   permissions :update_footnote? do
-    it_behaves_like 'permitted policy', 'footnotes.edit', restricted_ready: true
+    it_behaves_like 'permitted policy', 'footnotes.edit', archived: true
   end
 
 end
diff --git a/spec/policies/route_policy_spec.rb b/spec/policies/route_policy_spec.rb
index 706ead3a3..baf14c9fc 100644
--- a/spec/policies/route_policy_spec.rb
+++ b/spec/policies/route_policy_spec.rb
@@ -1,22 +1,22 @@
 RSpec.describe RoutePolicy, type: :policy do
 
   permissions :create? do
-    it_behaves_like 'permitted policy', 'routes.create', restricted_ready: true
+    it_behaves_like 'permitted policy', 'routes.create', archived: true
   end
 
   permissions :destroy? do
-    it_behaves_like 'permitted policy and same organisation', 'routes.destroy', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'routes.destroy', archived: true
   end
 
   permissions :edit? do
-    it_behaves_like 'permitted policy and same organisation', 'routes.edit', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'routes.edit', archived: true
   end
 
   permissions :new? do
-    it_behaves_like 'permitted policy', 'routes.create', restricted_ready: true
+    it_behaves_like 'permitted policy', 'routes.create', archived: true
   end
 
   permissions :update? do
-    it_behaves_like 'permitted policy and same organisation', 'routes.edit', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'routes.edit', archived: true
   end
 end
diff --git a/spec/policies/routing_constraint_zone_policy_spec.rb b/spec/policies/routing_constraint_zone_policy_spec.rb
index d017c1379..4b0f2cafe 100644
--- a/spec/policies/routing_constraint_zone_policy_spec.rb
+++ b/spec/policies/routing_constraint_zone_policy_spec.rb
@@ -1,22 +1,22 @@
 RSpec.describe RoutingConstraintZonePolicy, type: :policy do
 
   permissions :create? do
-    it_behaves_like 'permitted policy', 'routing_constraint_zones.create', restricted_ready: true
+    it_behaves_like 'permitted policy', 'routing_constraint_zones.create', archived: true
   end
 
   permissions :destroy? do
-    it_behaves_like 'permitted policy and same organisation', 'routing_constraint_zones.destroy', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'routing_constraint_zones.destroy', archived: true
   end
 
   permissions :edit? do
-    it_behaves_like 'permitted policy and same organisation', 'routing_constraint_zones.edit', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'routing_constraint_zones.edit', archived: true
   end
 
   permissions :new? do
-    it_behaves_like 'permitted policy', 'routing_constraint_zones.create', restricted_ready: true
+    it_behaves_like 'permitted policy', 'routing_constraint_zones.create', archived: true
   end
 
   permissions :update? do
-    it_behaves_like 'permitted policy and same organisation', 'routing_constraint_zones.edit', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'routing_constraint_zones.edit', archived: true
   end
 end
diff --git a/spec/policies/time_table_policy_spec.rb b/spec/policies/time_table_policy_spec.rb
index b73f1c662..1283a9fcf 100644
--- a/spec/policies/time_table_policy_spec.rb
+++ b/spec/policies/time_table_policy_spec.rb
@@ -1,17 +1,17 @@
 RSpec.describe TimeTablePolicy, type: :policy do
 
   permissions :duplicate? do
-    it_behaves_like 'permitted policy and same organisation', 'time_tables.create', restricted_ready: true
+    it_behaves_like 'permitted policy and same organisation', 'time_tables.create', archived: true
   end
 
   %w{destroy edit}.each do | permission |
     permissions "#{permission}?".to_sym do
-      it_behaves_like 'permitted policy and same organisation', "time_tables.#{permission}", restricted_ready: true
+      it_behaves_like 'permitted policy and same organisation', "time_tables.#{permission}", archived: true
     end
   end
 
   permissions :create? do
-    it_behaves_like 'permitted policy', 'time_tables.create', restricted_ready: true
+    it_behaves_like 'permitted policy', 'time_tables.create', archived: true
   end
 
 
diff --git a/spec/support/pundit/shared_examples.rb b/spec/support/pundit/shared_examples.rb
index 51a25ba7a..4d14c46da 100644
--- a/spec/support/pundit/shared_examples.rb
+++ b/spec/support/pundit/shared_examples.rb
@@ -1,5 +1,5 @@
 RSpec.shared_examples 'permitted policy and same organisation' do
-  | permission, restricted_ready: false|
+  | permission, archived: false|
 
   context 'permission absent → ' do
     it "denies a user with a different organisation" do
@@ -25,10 +25,10 @@ RSpec.shared_examples 'permitted policy and same organisation' do
       expect_it.to permit(user_context, referential)
     end
 
-    if restricted_ready
+    if archived
       it 'removes the permission for archived referentials' do
         user.update_attribute :organisation, referential.organisation
-        referential.update_attribute :ready, true
+        referential.update_attribute :archived_at, 42.seconds.ago
         expect_it.not_to permit(user_context, referential)
       end
     end
@@ -36,7 +36,7 @@ RSpec.shared_examples 'permitted policy and same organisation' do
 end
 
 RSpec.shared_examples 'permitted policy' do
-  | permission, restricted_ready: false|
+  | permission, archived: false|
   context 'permission absent → ' do
     it "denies a user with a different organisation" do
       expect_it.not_to permit(user_context, referential)
@@ -50,9 +50,9 @@ RSpec.shared_examples 'permitted policy' do
       expect_it.to permit(user_context, referential)
     end
 
-    if restricted_ready
+    if archived
       it 'removes the permission for archived referentials' do
-        referential.update_attribute :ready, true
+        referential.update_attribute :archived_at, 42.seconds.ago
         expect_it.not_to permit(user_context, referential)
       end
     end