Skip to content

Commit 7c60ef2

Browse files
committed
Bump rubocop + update config
1 parent 4538e52 commit 7c60ef2

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

.rubocop.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Metrics/ClassLength:
33
Metrics/AbcSize:
44
Enabled: false
55
Metrics/BlockLength:
6-
ExcludedMethods: ['describe', 'context', 'shared_examples']
6+
AllowedMethods: ['describe', 'context', 'shared_examples']
77
Metrics/CyclomaticComplexity:
88
Enabled: false
99
Layout/LineLength:
@@ -18,6 +18,12 @@ Style/MutableConstant:
1818
Enabled: false
1919
Gemspec/RequiredRubyVersion:
2020
Enabled: false
21+
Gemspec/RequireMFA:
22+
Enabled: false
23+
Gemspec/AddRuntimeDependency:
24+
Enabled: false
25+
Gemspec/DevelopmentDependencies:
26+
Enabled: false
2127
Lint/RaiseException:
2228
Enabled: false
2329
Lint/StructNewOverride:
@@ -28,5 +34,7 @@ Style/HashTransformKeys:
2834
Enabled: false
2935
Style/HashTransformValues:
3036
Enabled: false
37+
Style/FetchEnvVar:
38+
Enabled: false
3139
AllCops:
32-
NewCops: enable
40+
NewCops: enable

lib/omniauth/strategies/google_oauth2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def get_token_params
149149

150150
def get_scope(params)
151151
raw_scope = params[:scope] || DEFAULT_SCOPE
152-
scope_list = raw_scope.split(' ').map { |item| item.split(',') }.flatten
152+
scope_list = raw_scope.split.map { |item| item.split(',') }.flatten
153153
scope_list.map! { |s| s =~ %r{^https?://} || BASE_SCOPES.include?(s) ? s : "#{BASE_SCOPE_URL}#{s}" }
154154
scope_list.join(' ')
155155
end

omniauth-google-oauth2.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ Gem::Specification.new do |gem|
2727

2828
gem.add_development_dependency 'rake', '~> 12.0'
2929
gem.add_development_dependency 'rspec', '~> 3.6'
30-
gem.add_development_dependency 'rubocop', '~> 0.49'
30+
gem.add_development_dependency 'rubocop', '~> 1.82'
3131
end

spec/omniauth/strategies/google_oauth2_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@
744744
expect(subject).to receive(:client).and_return(client)
745745

746746
token = subject.build_access_token
747-
expect(token).to be_instance_of(::OAuth2::AccessToken)
747+
expect(token).to be_instance_of(OAuth2::AccessToken)
748748
expect(token.token).to eq('valid_access_token')
749749
expect(token.client).to eq(client)
750750
end
@@ -798,7 +798,7 @@
798798
expect(subject).to receive(:verify_token).with('valid_access_token').and_return true
799799

800800
token = subject.build_access_token
801-
expect(token).to be_instance_of(::OAuth2::AccessToken)
801+
expect(token).to be_instance_of(OAuth2::AccessToken)
802802
expect(token.token).to eq('valid_access_token')
803803
expect(token.client).to eq(client)
804804
end

0 commit comments

Comments
 (0)