Skip to content

Commit ef451f5

Browse files
GrantBirkiGrantBirki
committed
update linters
1 parent e5c015b commit ef451f5

14 files changed

Lines changed: 74 additions & 70 deletions

‎Gemfile.lock‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ GEM
5050
i18n (1.14.4)
5151
concurrent-ruby (~> 1.0)
5252
json (2.7.1)
53+
language_server-protocol (3.17.0.3)
5354
minitest (5.22.3)
5455
mutex_m (0.2.0)
5556
net-http (0.4.1)
@@ -83,28 +84,31 @@ GEM
8384
diff-lcs (>= 1.2.0, < 2.0)
8485
rspec-support (~> 3.8.0)
8586
rspec-support (3.8.3)
86-
rubocop (1.29.1)
87+
rubocop (1.62.1)
88+
json (~> 2.3)
89+
language_server-protocol (>= 3.17.0)
8790
parallel (~> 1.10)
88-
parser (>= 3.1.0.0)
91+
parser (>= 3.3.0.2)
8992
rainbow (>= 2.2.2, < 4.0)
9093
regexp_parser (>= 1.8, < 3.0)
9194
rexml (>= 3.2.5, < 4.0)
92-
rubocop-ast (>= 1.17.0, < 2.0)
95+
rubocop-ast (>= 1.31.1, < 2.0)
9396
ruby-progressbar (~> 1.7)
94-
unicode-display_width (>= 1.4.0, < 3.0)
97+
unicode-display_width (>= 2.4.0, < 3.0)
9598
rubocop-ast (1.31.2)
9699
parser (>= 3.3.0.4)
97-
rubocop-github (0.17.0)
98-
rubocop
99-
rubocop-performance
100-
rubocop-rails
101-
rubocop-performance (1.13.3)
102-
rubocop (>= 1.7.0, < 2.0)
103-
rubocop-ast (>= 0.4.0)
104-
rubocop-rails (2.15.2)
100+
rubocop-github (0.20.0)
101+
rubocop (>= 1.37)
102+
rubocop-performance (>= 1.15)
103+
rubocop-rails (>= 2.17)
104+
rubocop-performance (1.20.2)
105+
rubocop (>= 1.48.1, < 2.0)
106+
rubocop-ast (>= 1.30.0, < 2.0)
107+
rubocop-rails (2.24.1)
105108
activesupport (>= 4.2.0)
106109
rack (>= 1.1)
107-
rubocop (>= 1.7.0, < 2.0)
110+
rubocop (>= 1.33.0, < 2.0)
111+
rubocop-ast (>= 1.31.1, < 2.0)
108112
ruby-progressbar (1.13.0)
109113
rugged (1.7.2)
110114
sawyer (0.9.2)
@@ -136,9 +140,9 @@ DEPENDENCIES
136140
rake (~> 13.0.6)
137141
rspec (~> 3.8.0)
138142
rspec-core (~> 3.8.0)
139-
rubocop (= 1.29.1)
140-
rubocop-github (= 0.17.0)
141-
rubocop-performance (= 1.13.3)
143+
rubocop (= 1.62.1)
144+
rubocop-github (= 0.20.0)
145+
rubocop-performance (= 1.20.2)
142146
rugged (~> 1.7, >= 1.7.2)
143147
simplecov (= 0.16.1)
144148
simplecov-erb (= 1.0.1)

‎entitlements-github-plugin.gemspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
2323
s.add_development_dependency "rake", "~> 13.0.6"
2424
s.add_development_dependency "rspec", "~> 3.8.0"
2525
s.add_development_dependency "rspec-core", "~> 3.8.0"
26-
s.add_development_dependency "rubocop", "= 1.29.1"
27-
s.add_development_dependency "rubocop-github", "= 0.17.0"
28-
s.add_development_dependency "rubocop-performance", "= 1.13.3"
26+
s.add_development_dependency "rubocop", "= 1.62.1"
27+
s.add_development_dependency "rubocop-github", "= 0.20.0"
28+
s.add_development_dependency "rubocop-performance", "= 1.20.2"
2929
s.add_development_dependency "rugged", "~> 1.7", ">= 1.7.2"
3030
s.add_development_dependency "simplecov", "= 0.16.1"
3131
s.add_development_dependency "simplecov-erb", "= 1.0.1"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def graphql_pending_query(query)
260260
query = postdata["query"]
261261

262262
result = if query =~ /team\(slug:/
263-
graphql_team_query(query)
263+
graphql_team_query(query)
264264
elsif query =~ /membersWithRole\(/
265265
graphql_org_query(query)
266266
elsif query =~ /pendingMembers\(/

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,30 +86,30 @@
8686
)
8787
end
8888

89-
context "with changes" do
90-
let(:russian_blue_group) do
91-
Entitlements::Models::Group.new(
92-
dn: "cn=russian-blues,ou=kittensinc,ou=GitHub,dc=github,dc=com",
93-
members: Set.new(%w[RagaMuffin MAINECOON]),
94-
metadata: { "team_id" => 1001 }
95-
)
96-
end
97-
98-
let(:snowshoe_group) do
99-
Entitlements::Models::Group.new(
100-
dn: "cn=snowshoes,ou=kittensinc,ou=GitHub,dc=github,dc=com",
101-
members: Set.new(%w[blackmanx RagaMuffin MAINECOON])
102-
)
103-
end
104-
105-
let(:chicken_group) do
106-
Entitlements::Models::Group.new(
107-
dn: "cn=chicken,ou=kittensinc,ou=GitHub,dc=github,dc=fake",
108-
members: Set.new(%w[BlackManx highlander RUSSIANBLue])
109-
)
110-
end
111-
112-
it "logs expected output and returns expected actions" do
89+
context "with changes" do
90+
let(:russian_blue_group) do
91+
Entitlements::Models::Group.new(
92+
dn: "cn=russian-blues,ou=kittensinc,ou=GitHub,dc=github,dc=com",
93+
members: Set.new(%w[RagaMuffin MAINECOON]),
94+
metadata: { "team_id" => 1001 }
95+
)
96+
end
97+
98+
let(:snowshoe_group) do
99+
Entitlements::Models::Group.new(
100+
dn: "cn=snowshoes,ou=kittensinc,ou=GitHub,dc=github,dc=com",
101+
members: Set.new(%w[blackmanx RagaMuffin MAINECOON])
102+
)
103+
end
104+
105+
let(:chicken_group) do
106+
Entitlements::Models::Group.new(
107+
dn: "cn=chicken,ou=kittensinc,ou=GitHub,dc=github,dc=fake",
108+
members: Set.new(%w[BlackManx highlander RUSSIANBLue])
109+
)
110+
end
111+
112+
it "logs expected output and returns expected actions" do
113113
allow(Entitlements::Data::Groups::Calculated).to receive(:read_all)
114114
.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]))
@@ -145,8 +145,8 @@
145145
expect(result[1].dn).to eq("russian-blues")
146146
expect(result[1].existing.member_strings).to eq(Set.new(%w[blackmanx mainecoon]))
147147
expect(result[1].updated.member_strings).to eq(Set.new(%w[RagaMuffin MAINECOON]))
148-
end
149-
end
148+
end
149+
end
150150

151151
context "with no changes" do
152152
let(:russian_blue_group) do

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -711,14 +711,14 @@
711711
"Content-Type" => "application/json",
712712
}).to_return(status: 200, body: graphql_dotcom_response)
713713

714-
result = subject.send(:graphql_team_data, "grumpy-cat")
715-
members = ["highlander", "blackmanx", "toyger", "ocicat", "hubot", "korat", "mainecoon", "russianblue", "ragamuffin", "minskin"]
716-
expect(result).to eq(
717-
members:,
718-
team_id: 593721,
719-
parent_team_name: nil,
720-
roles: Hash[*members.collect { |member| [member, "member"] }.flatten],
721-
)
714+
result = subject.send(:graphql_team_data, "grumpy-cat")
715+
members = ["highlander", "blackmanx", "toyger", "ocicat", "hubot", "korat", "mainecoon", "russianblue", "ragamuffin", "minskin"]
716+
expect(result).to eq(
717+
members:,
718+
team_id: 593721,
719+
parent_team_name: nil,
720+
roles: Hash[*members.collect { |member| [member, "member"] }.flatten],
721+
)
722722
end
723723
end
724724

@@ -751,14 +751,14 @@
751751
{ status: 200, body: graphql_dotcom_response_3 }
752752
)
753753

754-
result = subject.send(:graphql_team_data, "grumpy-cat")
755-
members = ["highlander", "blackmanx", "toyger", "ocicat", "hubot", "korat", "mainecoon", "russianblue", "ragamuffin", "minskin"]
756-
expect(result).to eq(
757-
members:,
758-
team_id: 593721,
759-
parent_team_name: nil,
760-
roles: Hash[*members.collect { |member| [member, "member"] }.flatten],
761-
)
754+
result = subject.send(:graphql_team_data, "grumpy-cat")
755+
members = ["highlander", "blackmanx", "toyger", "ocicat", "hubot", "korat", "mainecoon", "russianblue", "ragamuffin", "minskin"]
756+
expect(result).to eq(
757+
members:,
758+
team_id: 593721,
759+
parent_team_name: nil,
760+
roles: Hash[*members.collect { |member| [member, "member"] }.flatten],
761+
)
762762
end
763763
end
764764

@@ -791,14 +791,14 @@
791791
{ status: 200, body: graphql_dotcom_response_3 }
792792
)
793793

794-
result = subject.send(:graphql_team_data, "grumpy-cat")
795-
members = ["highlander", "blackmanx", "toyger", "ocicat", "hubot", "korat", "mainecoon", "russianblue", "ragamuffin", "minskin"]
796-
expect(result).to eq(
797-
members:,
798-
team_id: 593721,
799-
parent_team_name: nil,
800-
roles: Hash[*members.collect { |member| [member, "member"] }.flatten],
801-
)
794+
result = subject.send(:graphql_team_data, "grumpy-cat")
795+
members = ["highlander", "blackmanx", "toyger", "ocicat", "hubot", "korat", "mainecoon", "russianblue", "ragamuffin", "minskin"]
796+
expect(result).to eq(
797+
members:,
798+
team_id: 593721,
799+
parent_team_name: nil,
800+
roles: Hash[*members.collect { |member| [member, "member"] }.flatten],
801+
)
802802
end
803803
end
804804
end

‎vendor/cache/language_server-protocol-3.17.0.3.gem‎

76.5 KB
Binary file not shown.

‎vendor/cache/rubocop-1.29.1.gem‎

-528 KB
Binary file not shown.

‎vendor/cache/rubocop-1.62.1.gem‎

619 KB
Binary file not shown.

‎vendor/cache/rubocop-github-0.17.0.gem‎

-18 KB
Binary file not shown.

‎vendor/cache/rubocop-github-0.20.0.gem‎

25.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)