From 818bacf718594441052820ea0e7b33b9491a5b71 Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 18 Dec 2017 11:53:16 +0100
Subject: Refs #5325@0.5h; Use policies for calendar sharing

Use policies to determine if a user is allowed to share a calendar,
instead of a hardcoded string
---
 spec/policies/calendar_policy_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'spec/policies')

diff --git a/spec/policies/calendar_policy_spec.rb b/spec/policies/calendar_policy_spec.rb
index 294be8198..8b1facc71 100644
--- a/spec/policies/calendar_policy_spec.rb
+++ b/spec/policies/calendar_policy_spec.rb
@@ -7,6 +7,9 @@ RSpec.describe CalendarPolicy, type: :policy do
   permissions :create? do
     it_behaves_like 'permitted policy', 'calendars.create', archived: true
   end
+  permissions :share? do
+    it_behaves_like 'permitted policy and same organisation', 'calendars.share', archived: true
+  end
   permissions :destroy? do
     it_behaves_like 'permitted policy and same organisation', 'calendars.destroy', archived: true
   end
-- 
cgit v1.2.3


From 6d5ca1fe9782f4e43b38079a920ab0770e2d1cce Mon Sep 17 00:00:00 2001
From: Zog
Date: Tue, 19 Dec 2017 13:16:03 +0100
Subject: Refs #5325; Fix calendat policy

Remove the "!archived?" condition which makes no sense here.
---
 spec/policies/calendar_policy_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'spec/policies')

diff --git a/spec/policies/calendar_policy_spec.rb b/spec/policies/calendar_policy_spec.rb
index 8b1facc71..5fd1eca47 100644
--- a/spec/policies/calendar_policy_spec.rb
+++ b/spec/policies/calendar_policy_spec.rb
@@ -5,21 +5,21 @@ RSpec.describe CalendarPolicy, type: :policy do
 
 
   permissions :create? do
-    it_behaves_like 'permitted policy', 'calendars.create', archived: true
+    it_behaves_like 'permitted policy', 'calendars.create'
   end
   permissions :share? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.share', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.share'
   end
   permissions :destroy? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.destroy', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.destroy'
   end
   permissions :edit? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.update', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.update'
   end
   permissions :new? do
-    it_behaves_like 'permitted policy', 'calendars.create', archived: true
+    it_behaves_like 'permitted policy', 'calendars.create'
   end
   permissions :update? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.update', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.update'
   end
 end
-- 
cgit v1.2.3