From 8951667e61ea607555c4fb719b15a192a652e06a Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Fri, 26 Jun 2020 18:45:11 +0200 Subject: [PATCH] Upstrream sync --- app/policies/acquired_media_release_policy.rb | 2 +- app/policies/appearance_release_policy.rb | 2 +- app/policies/location_release_policy.rb | 2 +- app/policies/material_release_policy.rb | 2 +- app/policies/medical_release_policy.rb | 2 +- app/policies/misc_release_policy.rb | 2 +- app/policies/music_release_policy.rb | 2 +- app/policies/talent_release_policy.rb | 2 +- .../acquired_media_release_policy_spec.rb | 13 +++++++++++-- .../appearance_release_policy_spec.rb | 13 +++++++++++-- spec/policies/location_release_policy_spec.rb | 19 ++++++++++++++----- spec/policies/material_release_policy_spec.rb | 19 ++++++++++++++----- spec/policies/medical_release_policy_spec.rb | 19 ++++++++++++++----- spec/policies/misc_release_policy_spec.rb | 19 ++++++++++++++----- spec/policies/music_release_policy_spec.rb | 13 +++++++++++-- spec/policies/talent_release_policy_spec.rb | 19 ++++++++++++++----- 16 files changed, 111 insertions(+), 39 deletions(-) diff --git a/app/policies/acquired_media_release_policy.rb b/app/policies/acquired_media_release_policy.rb index e947756..f2e5108 100644 --- a/app/policies/acquired_media_release_policy.rb +++ b/app/policies/acquired_media_release_policy.rb @@ -12,7 +12,7 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy end def destroy? - true + user.manager? || user.account_manager? end def tag_multiple? diff --git a/app/policies/appearance_release_policy.rb b/app/policies/appearance_release_policy.rb index 1cec72f..b49287b 100644 --- a/app/policies/appearance_release_policy.rb +++ b/app/policies/appearance_release_policy.rb @@ -16,7 +16,7 @@ class AppearanceReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def tag_multiple? diff --git a/app/policies/location_release_policy.rb b/app/policies/location_release_policy.rb index e372806..66e2114 100644 --- a/app/policies/location_release_policy.rb +++ b/app/policies/location_release_policy.rb @@ -16,7 +16,7 @@ class LocationReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def edit_photos? diff --git a/app/policies/material_release_policy.rb b/app/policies/material_release_policy.rb index 6934bb1..4c834f7 100644 --- a/app/policies/material_release_policy.rb +++ b/app/policies/material_release_policy.rb @@ -16,7 +16,7 @@ class MaterialReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def edit_photos? diff --git a/app/policies/medical_release_policy.rb b/app/policies/medical_release_policy.rb index 087f087..8866337 100644 --- a/app/policies/medical_release_policy.rb +++ b/app/policies/medical_release_policy.rb @@ -12,7 +12,7 @@ class MedicalReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def edit_photos? diff --git a/app/policies/misc_release_policy.rb b/app/policies/misc_release_policy.rb index 99b40e3..06bae3b 100644 --- a/app/policies/misc_release_policy.rb +++ b/app/policies/misc_release_policy.rb @@ -12,7 +12,7 @@ class MiscReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def edit_photos? diff --git a/app/policies/music_release_policy.rb b/app/policies/music_release_policy.rb index 89ce948..14d0224 100644 --- a/app/policies/music_release_policy.rb +++ b/app/policies/music_release_policy.rb @@ -12,7 +12,7 @@ class MusicReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def tag_multiple? diff --git a/app/policies/talent_release_policy.rb b/app/policies/talent_release_policy.rb index 2cfe659..5d3a308 100644 --- a/app/policies/talent_release_policy.rb +++ b/app/policies/talent_release_policy.rb @@ -12,7 +12,7 @@ class TalentReleasePolicy < ReleasePolicy end def destroy? - true + user.manager? || user.account_manager? end def edit_photos? diff --git a/spec/policies/acquired_media_release_policy_spec.rb b/spec/policies/acquired_media_release_policy_spec.rb index ad580fc..3f366a5 100644 --- a/spec/policies/acquired_media_release_policy_spec.rb +++ b/spec/policies/acquired_media_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe AcquiredMediaReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -24,6 +25,14 @@ describe AcquiredMediaReleasePolicy do end permissions :destroy? do - it { is_expected.to permit(:destroy) } + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end end end diff --git a/spec/policies/appearance_release_policy_spec.rb b/spec/policies/appearance_release_policy_spec.rb index 64920a4..a9f474c 100644 --- a/spec/policies/appearance_release_policy_spec.rb +++ b/spec/policies/appearance_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe AppearanceReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -24,6 +25,14 @@ describe AppearanceReleasePolicy do end permissions :destroy? do - it { is_expected.to permit(:destroy) } + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end end end diff --git a/spec/policies/location_release_policy_spec.rb b/spec/policies/location_release_policy_spec.rb index d98916f..cc5a84a 100644 --- a/spec/policies/location_release_policy_spec.rb +++ b/spec/policies/location_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe LocationReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -23,10 +24,6 @@ describe LocationReleasePolicy do end end - permissions :destroy? do - it { is_expected.to permit(:destroy) } - end - permissions :edit_photos? do it { is_expected.to permit(:edit_photos) } end @@ -34,4 +31,16 @@ describe LocationReleasePolicy do permissions :update_photos? do it { is_expected.to permit(:update_photos) } end + + permissions :destroy? do + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end + end end diff --git a/spec/policies/material_release_policy_spec.rb b/spec/policies/material_release_policy_spec.rb index 85042a9..f3e675a 100644 --- a/spec/policies/material_release_policy_spec.rb +++ b/spec/policies/material_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe MaterialReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -23,10 +24,6 @@ describe MaterialReleasePolicy do end end - permissions :destroy? do - it { is_expected.to permit(:destroy) } - end - permissions :edit_photos? do it { is_expected.to permit(:edit_photos) } end @@ -34,4 +31,16 @@ describe MaterialReleasePolicy do permissions :update_photos? do it { is_expected.to permit(:update_photos) } end + + permissions :destroy? do + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end + end end diff --git a/spec/policies/medical_release_policy_spec.rb b/spec/policies/medical_release_policy_spec.rb index 8b79891..4f7e1ff 100644 --- a/spec/policies/medical_release_policy_spec.rb +++ b/spec/policies/medical_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe MedicalReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -23,10 +24,6 @@ describe MedicalReleasePolicy do end end - permissions :destroy? do - it { is_expected.to permit(:destroy) } - end - permissions :edit_photos? do it { is_expected.to permit(:edit_photos) } end @@ -34,4 +31,16 @@ describe MedicalReleasePolicy do permissions :update_photos? do it { is_expected.to permit(:update_photos) } end + + permissions :destroy? do + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end + end end diff --git a/spec/policies/misc_release_policy_spec.rb b/spec/policies/misc_release_policy_spec.rb index 3105adb..2b2a9f7 100644 --- a/spec/policies/misc_release_policy_spec.rb +++ b/spec/policies/misc_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe MiscReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -19,10 +20,6 @@ describe MiscReleasePolicy do end end - permissions :destroy? do - it { is_expected.to permit(:destroy) } - end - permissions :edit_photos? do it { is_expected.to permit(:edit_photos) } end @@ -30,4 +27,16 @@ describe MiscReleasePolicy do permissions :update_photos? do it { is_expected.to permit(:update_photos) } end + + permissions :destroy? do + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end + end end diff --git a/spec/policies/music_release_policy_spec.rb b/spec/policies/music_release_policy_spec.rb index e84b556..d03c13d 100644 --- a/spec/policies/music_release_policy_spec.rb +++ b/spec/policies/music_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" RSpec.describe MusicReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -18,6 +19,14 @@ RSpec.describe MusicReleasePolicy do end permissions :destroy? do - it { is_expected.to permit(:destroy) } + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end end end diff --git a/spec/policies/talent_release_policy_spec.rb b/spec/policies/talent_release_policy_spec.rb index 22f025e..9dc2e86 100644 --- a/spec/policies/talent_release_policy_spec.rb +++ b/spec/policies/talent_release_policy_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" describe TalentReleasePolicy do - let(:user_context) { build(:user_context) } + let(:user) { create(:user, :manager) } + let(:user_context) { build(:user_context, user: user, account: user.primary_account) } subject { described_class } @@ -23,10 +24,6 @@ describe TalentReleasePolicy do end end - permissions :destroy? do - it { is_expected.to permit(:destroy) } - end - permissions :edit_photos? do it { is_expected.to permit(:edit_photos) } end @@ -34,4 +31,16 @@ describe TalentReleasePolicy do permissions :update_photos? do it { is_expected.to permit(:update_photos) } end + + permissions :destroy? do + it { is_expected.to permit(user_context, :destroy) } + end + + context "for an associate" do + let(:user) { create(:user, :associate) } + + permissions :destroy? do + it { is_expected.not_to permit(user_context, :destroy) } + end + end end