Skip to content

Commit c23e1a1

Browse files
nobe4nobe4
committed
fix(lint,test): format code and update error test
1 parent 857c46f commit c23e1a1

File tree

8 files changed

+59
-58
lines changed

8 files changed

+59
-58
lines changed

‎lib/entitlements/backend/github_team/provider.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def create_github_team_group(entitlement_group)
162162
metadata = entitlement_group.metadata
163163
metadata["team_id"] = -999
164164
rescue Entitlements::Models::Group::NoMetadata
165-
metadata = {"team_id" => -999}
165+
metadata = { "team_id" => -999 }
166166
end
167167
Entitlements::Backend::GitHubTeam::Models::Team.new(
168168
team_id: -999,

‎lib/entitlements/service/github.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def graphql_http_post(query)
345345
return result
346346
else
347347
Entitlements.logger.warn "GraphQL failed on try #{try_number} of #{MAX_GRAPHQL_RETRIES}. Will retry."
348-
sleep WAIT_BETWEEN_GRAPHQL_RETRIES * (2 ** (try_number - 1))
348+
sleep WAIT_BETWEEN_GRAPHQL_RETRIES * (2**(try_number - 1))
349349
end
350350
end
351351
end

‎spec/acceptance/github-server/web.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def graphql_org_query(query)
124124
result.each do |user, role|
125125
end_cursor = Base64.strict_encode64(user)
126126
next if !cursor_flag && end_cursor != cursor
127-
edges << { "node" => { "login" => user }, "role" => role} if cursor_flag
127+
edges << { "node" => { "login" => user }, "role" => role } if cursor_flag
128128
cursor_flag = true
129129
break if edges.size >= first
130130
end
@@ -405,6 +405,7 @@ def graphql_pending_query(query)
405405
halt 201
406406
end
407407

408+
# rubocop:disable AvoidObjectSendWithDynamicMethod
408409
[:get, :patch, :put, :delete, :post].each do |verb|
409410
send verb, "/*" do
410411
raise "No route registered for #{params}. Take a look in #{__FILE__}"

‎spec/acceptance/tests/spec_helper.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def ldap_obj
8383
host: uri.host,
8484
port: uri.port,
8585
encryption: (uri.scheme == "ldaps" ? :simple_tls : nil),
86-
auth: {method: :simple, username: ENV["LDAP_BINDDN"], password: ENV["LDAP_BINDPW"]}
86+
auth: { method: :simple, username: ENV["LDAP_BINDDN"], password: ENV["LDAP_BINDPW"] }
8787
)
8888

8989
ldap_object.bind

‎spec/unit/entitlements/backend/github_org/controller_spec.rb‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,18 @@
151151
context "with pending members" do
152152
let(:org1_members_response) do
153153
{
154-
"toyger" => "admin",
155-
"highlander" => "admin",
156-
"blackmanx" => "member",
157-
"russianblue" => "member"
154+
"toyger" => "admin",
155+
"highlander" => "admin",
156+
"blackmanx" => "member",
157+
"russianblue" => "member"
158158
}
159159
end
160160

161161
let(:org1_pending_members) { Set.new(%w[ragamuffin peterbald]) }
162162

163163
let(:org2_members_response) do
164164
{
165-
"russianblue" => "admin"
165+
"russianblue" => "admin"
166166
}
167167
end
168168

@@ -182,7 +182,7 @@
182182

183183
it "logs expected output and returns expected actions" do
184184
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
185-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
185+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
186186
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
187187
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
188188
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -267,7 +267,7 @@
267267

268268
it "logs expected output and returns expected actions" do
269269
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
270-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
270+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
271271
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
272272
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
273273
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -318,21 +318,21 @@
318318
{
319319
"ragamuffin" => "admin",
320320
"mainecoon" => "admin",
321-
"blackmanx" => "member",
322-
"highlander" => "member",
321+
"blackmanx" => "member",
322+
"highlander" => "member",
323323
"peterbald" => "member"
324324
}
325325
end
326326

327327
let(:org2_members_response) do
328328
{
329-
"russianblue" => "admin"
329+
"russianblue" => "admin"
330330
}
331331
end
332332

333333
it "does not run actions" do
334334
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
335-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
335+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
336336
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
337337
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
338338
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -378,7 +378,7 @@
378378

379379
it "handles removals and role changes but does not invite" do
380380
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
381-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "features"=>%w[remove], "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
381+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "features" => %w[remove], "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
382382
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
383383
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
384384
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -414,8 +414,8 @@
414414
"MAINECOON"
415415
]))
416416
expect(result[0].implementation).to eq([
417-
{ action: :add, person: "RagaMuffin"},
418-
{ action: :remove, person: "russianblue"}
417+
{ action: :add, person: "RagaMuffin" },
418+
{ action: :remove, person: "russianblue" }
419419
])
420420

421421
expect(result[1]).to be_a_kind_of(Entitlements::Models::Action)
@@ -425,7 +425,7 @@
425425
"peterbald"
426426
]))
427427
expect(result[1].implementation).to eq([
428-
{ action: :remove, person: "toyger"}
428+
{ action: :remove, person: "toyger" }
429429
])
430430
end
431431
end
@@ -441,7 +441,7 @@
441441

442442
it "reports as a no-op" do
443443
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
444-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "features"=>%w[remove], "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
444+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "features" => %w[remove], "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
445445
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
446446
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
447447
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -490,7 +490,7 @@
490490

491491
it "handles removals and role changes but does not invite" do
492492
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
493-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "features"=>%w[invite], "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
493+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "features" => %w[invite], "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
494494
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
495495
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
496496
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -527,7 +527,7 @@
527527
"MAINECOON"
528528
]))
529529
expect(result[0].implementation).to eq([
530-
{ action: :add, person: "RagaMuffin"}
530+
{ action: :add, person: "RagaMuffin" }
531531
])
532532

533533
expect(result[1]).to be_a_kind_of(Entitlements::Models::Action)
@@ -539,7 +539,7 @@
539539
"peterbald"
540540
]))
541541
expect(result[1].implementation).to eq([
542-
{ action: :add, person: "blackmanx"}
542+
{ action: :add, person: "blackmanx" }
543543
])
544544
end
545545
end
@@ -559,7 +559,7 @@
559559

560560
it "reports as a no-op" do
561561
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
562-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "features"=>%w[invite], "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
562+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "features" => %w[invite], "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
563563
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
564564
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
565565
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -595,7 +595,7 @@
595595
cache[:predictive_state] = { by_dn: { org1_admin_dn => { members: admins, metadata: nil }, org1_member_dn => { members:, metadata: nil } }, invalid: Set.new }
596596

597597
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
598-
.with("foo-githuborg", { "base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
598+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
599599
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
600600

601601
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
@@ -666,7 +666,7 @@
666666

667667
it "handles removals and role changes but does not invite" do
668668
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
669-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "features"=>[], "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
669+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "features" => [], "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
670670
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
671671
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
672672
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -702,7 +702,7 @@
702702
"MAINECOON"
703703
]))
704704
expect(result[0].implementation).to eq([
705-
{ action: :add, person: "RagaMuffin"}
705+
{ action: :add, person: "RagaMuffin" }
706706
])
707707

708708
expect(result[1]).to be_a_kind_of(Entitlements::Models::Action)
@@ -729,7 +729,7 @@
729729

730730
it "reports as a no-op" do
731731
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
732-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "features"=>[], "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
732+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "features" => [], "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
733733
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
734734
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_admin_dn).and_return(org1_admin_group)
735735
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(org1_member_dn).and_return(org1_member_group)
@@ -840,7 +840,7 @@
840840
describe "#validate_github_org_ous!" do
841841
it "raises if an admin or member group is missing" do
842842
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
843-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
843+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
844844
.and_return(Set.new(%w[member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
845845

846846
github_double = instance_double(Entitlements::Backend::GitHubOrg::Provider)
@@ -860,7 +860,7 @@
860860
dns = %w[admin member kittens cats].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }
861861

862862
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
863-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
863+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
864864
.and_return(Set.new(dns))
865865

866866
allow(Entitlements::Backend::GitHubOrg::Service).to receive(:new).and_return(service)
@@ -900,7 +900,7 @@
900900

901901
it "raises due to duplicate users" do
902902
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
903-
.with("foo-githuborg", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
903+
.with("foo-githuborg", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
904904
.and_return(Set.new(%w[admin member].map { |cn| "cn=#{cn},ou=kittensinc,ou=GitHub,dc=github,dc=com" }))
905905
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(admin_dn).and_return(admin_group)
906906
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with(member_dn).and_return(member_group)

‎spec/unit/entitlements/backend/github_team/controller_spec.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
team_name: "russian-blues",
3636
ou: "ou=kittensinc,ou=GitHub,dc=github,dc=com",
3737
members: Set.new(%w[blackmanx MAINECOON]),
38-
metadata: {"team_id" => 1001}
38+
metadata: { "team_id" => 1001 }
3939
)
4040
end
4141

@@ -44,7 +44,7 @@
4444
dn: "cn=russian-blues,ou=kittensinc,ou=GitHub,dc=github,dc=fake",
4545
description: ":smile_cat:",
4646
members: Set.new(%w[blackmanx MAINECOON]),
47-
metadata: {"team_id" => 1001}
47+
metadata: { "team_id" => 1001 }
4848
)
4949
end
5050

@@ -54,7 +54,7 @@
5454
team_name: "snowshoes",
5555
ou: "ou=kittensinc,ou=GitHub,dc=github,dc=com",
5656
members: Set.new(%w[blackmanx MAINECOON]),
57-
metadata: {"team_id" => 1002}
57+
metadata: { "team_id" => 1002 }
5858
)
5959
end
6060

@@ -63,7 +63,7 @@
6363
dn: "cn=snowshoes,ou=kittensinc,ou=GitHub,dc=github,dc=fake",
6464
description: ":smile_cat:",
6565
members: Set.new(%w[blackmanx MAINECOON]),
66-
metadata: {"team_id" => 1002}
66+
metadata: { "team_id" => 1002 }
6767
)
6868
end
6969

@@ -73,7 +73,7 @@
7373
team_name: "chicken",
7474
ou: "ou=kittensinc,ou=GitHub,dc=github,dc=fake",
7575
members: Set.new(%w[blackmanx]),
76-
metadata: {"team_id" => 10001}
76+
metadata: { "team_id" => 10001 }
7777
)
7878
end
7979

@@ -82,7 +82,7 @@
8282
dn: "cn=chicken,ou=kittensinc,ou=GitHub,dc=github,dc=fake",
8383
description: ":smile_cat:",
8484
members: Set.new(%w[blackmanx]),
85-
metadata: {"team_id" => 10001}
85+
metadata: { "team_id" => 10001 }
8686
)
8787
end
8888

@@ -111,7 +111,7 @@
111111

112112
it "logs expected output and returns expected actions" do
113113
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
114-
.with("foo-githubteam", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
114+
.with("foo-githubteam", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
115115
.and_return(Set.new(%w[snowshoes russian-blues]))
116116
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with("snowshoes").and_return(snowshoe_group)
117117
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with("russian-blues").and_return(russian_blue_group)
@@ -159,7 +159,7 @@
159159

160160
it "does not run actions if there are no diffs detected" do
161161
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
162-
.with("foo-githubteam", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
162+
.with("foo-githubteam", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
163163
.and_return(Set.new(%w[russian-blues]))
164164
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with("russian-blues").and_return(russian_blue_group)
165165
allow(Entitlements::Util::Util).to receive(:dns_for_ou).with("foo-githubteam", anything).and_return([russian_blue_group.dn])
@@ -205,7 +205,7 @@
205205

206206
it "logs expected output and returns expected actions" do
207207
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
208-
.with("foo-githubteam", {"base"=>"ou=kittensinc,ou=GitHub,dc=github,dc=com", "org"=>"kittensinc", "token"=>"CuteAndCuddlyKittens", "ignore_not_found"=>false})
208+
.with("foo-githubteam", { "base" => "ou=kittensinc,ou=GitHub,dc=github,dc=com", "org" => "kittensinc", "token" => "CuteAndCuddlyKittens", "ignore_not_found" => false })
209209
.and_return(Set.new(%w[snowshoes russian-blues]))
210210
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with("snowshoes").and_return(snowshoe_group)
211211
allow(Entitlements::Data::Groups::Calculated).to receive(:read).with("russian-blues").and_return(russian_blue_group)

0 commit comments

Comments
 (0)