Skip to content

Commit 2459bfd

Browse files
Apply suggestions from code review
Co-authored-by: Niklas van Schrick <mc.taucher2003@gmail.com> Signed-off-by: Raphael Götz <52959657+raphael-goetz@users.noreply.github.com>
1 parent 69c812e commit 2459bfd

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

app/models/concerns/namespace_parent.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def ensure_namespace
1313
ns = build_namespace
1414
if persisted?
1515
ns.save
16-
ns.ensure_personal_namespace_administrator! if is_a?(User)
16+
ns.ensure_personal_namespace_administrator! if ns.user_type?
1717
end
1818
ns
1919
end

app/policies/namespace_member_policy.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ class NamespaceMemberPolicy < BasePolicy
88

99
rule { member_is_self }.enable :delete_member
1010

11-
rule { personal_namespace_owner_member }.prevent :delete_member
12-
rule { personal_namespace_owner_member }.prevent :assign_member_roles
11+
rule { personal_namespace_owner_member }.policy do
12+
prevent :delete_member
13+
prevent :assign_member_roles
14+
end
1315
end

app/policies/namespace_role_policy.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ class NamespaceRolePolicy < BasePolicy
77
subject.namespace.personal_namespace_owner_administrator_role?(subject)
88
end
99

10-
rule { personal_namespace_owner_administrator_role }.prevent :delete_namespace_role
11-
rule { personal_namespace_owner_administrator_role }.prevent :assign_role_abilities
12-
rule { personal_namespace_owner_administrator_role }.prevent :assign_role_projects
10+
rule { personal_namespace_owner_administrator_role }.policy do
11+
prevent :delete_namespace_role
12+
prevent :assign_role_abilities
13+
prevent :assign_role_projects
14+
end
1315
end

spec/policies/namespace_project_policy_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
let(:namespace) { current_user.ensure_namespace }
2626
let(:namespace_project) { create(:namespace_project, namespace: namespace) }
2727

28-
it { is_expected.to be_allowed(:read_namespace_project) }
28+
it { is_expected.to be_allowed(:update_namespace_project) }
2929
end
3030
end

0 commit comments

Comments
 (0)