Skip to content

Commit 964234a

Browse files
Rename can_admin? -> can_perform_gem_admin?
This variant feels cleaner to me. Hopefully others will agree.
1 parent 30706cf commit 964234a

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

app/models/gem_permissions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def can_manage_owners?
1818
role_granted?(:owner)
1919
end
2020

21-
def can_admin?
21+
def can_perform_gem_admin?
2222
role_granted?(:admin)
2323
end
2424

app/policies/rubygem_policy.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ def create?
1313
end
1414

1515
def configure_oidc?
16-
gem_permissions.can_admin? || deny
16+
gem_permissions.can_perform_gem_admin? || deny
1717
end
1818

1919
def configure_trusted_publishers?
20-
gem_permissions.can_admin? || deny
20+
gem_permissions.can_perform_gem_admin? || deny
2121
end
2222

2323
def show_events?
2424
gem_permissions.can_push? || deny
2525
end
2626

2727
def show_unconfirmed_ownerships?
28-
gem_permissions.can_admin? || deny
28+
gem_permissions.can_perform_gem_admin? || deny
2929
end
3030

3131
def add_owner?

test/models/gem_permissions_test.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,39 +49,39 @@ class GemPermissionsTest < ActiveSupport::TestCase
4949
end
5050
end
5151

52-
context "#can_admin?" do
52+
context "#can_perform_gem_admin?" do
5353
should "return false when user is a maintainer of the organization" do
5454
create(:membership, organization: @organization, user: @user, role: :maintainer)
5555

56-
refute_predicate @permissions, :can_admin?
56+
refute_predicate @permissions, :can_perform_gem_admin?
5757
end
5858

5959
should "return true when user is an admin of the organization" do
6060
create(:membership, organization: @organization, user: @user, role: :admin)
6161

62-
assert_predicate @permissions, :can_admin?
62+
assert_predicate @permissions, :can_perform_gem_admin?
6363
end
6464

6565
should "return true when user is an owner of the organization" do
6666
create(:membership, organization: @organization, user: @user, role: :owner)
6767

68-
assert_predicate @permissions, :can_admin?
68+
assert_predicate @permissions, :can_perform_gem_admin?
6969
end
7070

7171
should "return false when user is not a member of the organization" do
72-
refute_predicate @permissions, :can_admin?
72+
refute_predicate @permissions, :can_perform_gem_admin?
7373
end
7474

7575
should "return false when user has unconfirmed admin membership" do
7676
create(:membership, organization: @organization, user: @user, role: :admin, confirmed_at: nil)
7777

78-
refute_predicate @permissions, :can_admin?
78+
refute_predicate @permissions, :can_perform_gem_admin?
7979
end
8080

8181
should "return false when user is nil" do
8282
permissions = GemPermissions.new(@rubygem, nil)
8383

84-
refute_predicate permissions, :can_admin?
84+
refute_predicate permissions, :can_perform_gem_admin?
8585
end
8686
end
8787

@@ -152,27 +152,27 @@ class GemPermissionsTest < ActiveSupport::TestCase
152152
end
153153
end
154154

155-
context "#can_admin?" do
155+
context "#can_perform_gem_admin?" do
156156
should "return false when user has maintainer ownership" do
157157
create(:ownership, user: @user, rubygem: @rubygem, role: :maintainer)
158158

159-
refute_predicate @permissions, :can_admin?
159+
refute_predicate @permissions, :can_perform_gem_admin?
160160
end
161161

162162
should "return true when user has owner ownership" do
163163
create(:ownership, user: @user, rubygem: @rubygem, role: :owner)
164164

165-
assert_predicate @permissions, :can_admin?
165+
assert_predicate @permissions, :can_perform_gem_admin?
166166
end
167167

168168
should "return false when user has no ownership" do
169-
refute_predicate @permissions, :can_admin?
169+
refute_predicate @permissions, :can_perform_gem_admin?
170170
end
171171

172172
should "return false when user is nil" do
173173
permissions = GemPermissions.new(@rubygem, nil)
174174

175-
refute_predicate permissions, :can_admin?
175+
refute_predicate permissions, :can_perform_gem_admin?
176176
end
177177
end
178178

@@ -219,7 +219,7 @@ class GemPermissionsTest < ActiveSupport::TestCase
219219

220220
# All valid roles should work
221221
assert_predicate permissions, :can_push?
222-
assert_predicate permissions, :can_admin?
222+
assert_predicate permissions, :can_perform_gem_admin?
223223
assert_predicate permissions, :can_manage_owners?
224224
end
225225
end

0 commit comments

Comments
 (0)