Fix rubocop errors

Author: davidwessman

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

test/lib/omniauth/strategies/openid_connect_test.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative '../../../test_helper'
 
 module OmniAuth
   module Strategies
-    class OpenIDConnectTest < StrategyTestCase
+    class OpenIDConnectTest < StrategyTestCase # rubocop:disable Metrics/ClassLength
       def test_client_options_defaults
         assert_equal 'https', strategy.options.client_options.scheme
         assert_equal 443, strategy.options.client_options.port
@@ -11,15 +13,15 @@ def test_client_options_defaults
       end
 
       def test_request_phase
-        expected_redirect = /^https:\/\/example\.com\/authorize\?client_id=1234&nonce=\w{32}&response_type=code&scope=openid&state=\w{32}$/
+        expected_redirect = %r{^https://example\.com/authorize\?client_id=1234&nonce=\w{32}&response_type=code&scope=openid&state=\w{32}$}
         strategy.options.issuer = 'example.com'
         strategy.options.client_options.host = 'example.com'
         strategy.expects(:redirect).with(regexp_matches(expected_redirect))
         strategy.request_phase
       end
 
       def test_logout_phase_with_discovery
-        expected_redirect = %r{^https:\/\/example\.com\/logout$}
+        expected_redirect = %r{^https://example\.com/logout$}
         strategy.options.client_options.host = 'example.com'
         strategy.options.discovery = true
 
@@ -78,7 +80,7 @@ def test_logout_phase
       end
 
       def test_request_phase_with_params
-        expected_redirect = /^https:\/\/example\.com\/authorize\?claims_locales=es&client_id=1234&login_hint=john.doe%40example.com&nonce=\w{32}&response_type=code&scope=openid&state=\w{32}&ui_locales=en$/
+        expected_redirect = %r{^https://example\.com/authorize\?claims_locales=es&client_id=1234&login_hint=john.doe%40example.com&nonce=\w{32}&response_type=code&scope=openid&state=\w{32}&ui_locales=en$}
         strategy.options.issuer = 'example.com'
         strategy.options.client_options.host = 'example.com'
         request.stubs(:params).returns('login_hint' => 'john.doe@example.com', 'ui_locales' => 'en', 'claims_locales' => 'es')
@@ -88,7 +90,7 @@ def test_request_phase_with_params
       end
 
       def test_request_phase_with_discovery
-        expected_redirect = /^https:\/\/example\.com\/authorization\?client_id=1234&nonce=\w{32}&response_type=code&scope=openid&state=\w{32}$/
+        expected_redirect = %r{^https://example\.com/authorization\?client_id=1234&nonce=\w{32}&response_type=code&scope=openid&state=\w{32}$}
         strategy.options.client_options.host = 'example.com'
         strategy.options.discovery = true
 
@@ -115,7 +117,7 @@ def test_request_phase_with_discovery
       end
 
       def test_request_phase_with_response_mode
-        expected_redirect = /^https:\/\/example\.com\/authorize\?client_id=1234&nonce=\w{32}&response_mode=form_post&response_type=id_token&scope=openid&state=\w{32}$/
+        expected_redirect = %r{^https://example\.com/authorize\?client_id=1234&nonce=\w{32}&response_mode=form_post&response_type=id_token&scope=openid&state=\w{32}$}
         strategy.options.issuer = 'example.com'
         strategy.options.response_mode = 'form_post'
         strategy.options.response_type = 'id_token'
@@ -126,7 +128,7 @@ def test_request_phase_with_response_mode
       end
 
       def test_request_phase_with_response_mode_symbol
-        expected_redirect = /^https:\/\/example\.com\/authorize\?client_id=1234&nonce=\w{32}&response_mode=form_post&response_type=id_token&scope=openid&state=\w{32}$/
+        expected_redirect = %r{^https://example\.com/authorize\?client_id=1234&nonce=\w{32}&response_mode=form_post&response_type=id_token&scope=openid&state=\w{32}$}
         strategy.options.issuer = 'example.com'
         strategy.options.response_mode = 'form_post'
         strategy.options.response_type = :id_token
@@ -139,15 +141,15 @@ def test_request_phase_with_response_mode_symbol
       def test_option_acr_values
         strategy.options.client_options[:host] = 'foobar.com'
 
-        assert(!(strategy.authorize_uri =~ /acr_values=/), 'URI must not contain acr_values')
+        refute_match(/acr_values=/, strategy.authorize_uri, 'URI must not contain acr_values')
 
         strategy.options.acr_values = 'urn:some:acr:values:value'
-        assert(strategy.authorize_uri =~ /acr_values=/, 'URI must contain acr_values')
+        assert_match(/acr_values=/, strategy.authorize_uri, 'URI must contain acr_values')
       end
 
       def test_option_custom_attributes
         strategy.options.client_options[:host] = 'foobar.com'
-        strategy.options.extra_authorize_params = {resource: 'xyz'}
+        strategy.options.extra_authorize_params = { resource: 'xyz' }
 
         assert(strategy.authorize_uri =~ /resource=xyz/, 'URI must contain custom params')
       end
@@ -175,7 +177,7 @@ def test_uid
         assert_equal user_info.sub, strategy.uid
       end
 
-      def test_callback_phase(session = {}, params = {})
+      def test_callback_phase(_session = {}, _params = {})
         code = SecureRandom.hex(16)
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
@@ -237,7 +239,7 @@ def test_callback_phase_with_id_token
         strategy.callback_phase
       end
 
-      def test_callback_phase_with_discovery
+      def test_callback_phase_with_discovery # rubocop:disable Metrics/AbcSize
         code = SecureRandom.hex(16)
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
@@ -287,7 +289,7 @@ def test_callback_phase_with_error
         request.stubs(:params).returns('error' => 'invalid_request')
         request.stubs(:path).returns('')
 
-        strategy.call!({'rack.session' => {'omniauth.state' => state, 'omniauth.nonce' => nonce}})
+        strategy.call!({ 'rack.session' => { 'omniauth.state' => state, 'omniauth.nonce' => nonce } })
         strategy.expects(:fail!)
         strategy.callback_phase
       end
@@ -465,19 +467,18 @@ def test_credentials
             token: access_token.access_token,
             refresh_token: access_token.refresh_token,
             expires_in: access_token.expires_in,
-            scope: access_token.scope
+            scope: access_token.scope,
           },
           strategy.credentials
         )
       end
 
       def test_option_send_nonce
         strategy.options.client_options[:host] = 'foobar.com'
-
-        assert(strategy.authorize_uri =~ /nonce=/, 'URI must contain nonce')
+        assert_match(/nonce/, strategy.authorize_uri, 'URI must contain nonce')
 
         strategy.options.send_nonce = false
-        assert(!(strategy.authorize_uri =~ /nonce=/), 'URI must not contain nonce')
+        refute_match(/nonce/, strategy.authorize_uri, 'URI must not contain nonce')
       end
 
       def test_failure_endpoint_redirect
@@ -487,9 +488,9 @@ def test_failure_endpoint_redirect
 
         result = strategy.callback_phase
 
-        assert(result.is_a? Array)
+        assert(result.is_a?(Array))
         assert(result[0] == 302, 'Redirect')
-        assert(result[1]["Location"] =~ /\/auth\/failure/)
+        assert(result[1]['Location'] =~ %r{/auth/failure})
       end
 
       def test_state
@@ -518,7 +519,7 @@ def test_state
       def test_dynamic_state
         # Stub request parameters
         request.stubs(:path).returns('')
-        strategy.call!('rack.session' => { }, QUERY_STRING: { state: 'abc', client_id: '123' } )
+        strategy.call!('rack.session' => {}, QUERY_STRING: { state: 'abc', client_id: '123' })
 
         strategy.options.state = lambda { |env|
           # Get params from request, e.g. CGI.parse(env['QUERY_STRING'])
@@ -563,7 +564,7 @@ def test_option_client_auth_method
           {}
         ).returns(success)
 
-        assert(strategy.send :access_token)
+        assert(strategy.send(:access_token))
       end
 
       def test_public_key_with_jwks
@@ -605,12 +606,12 @@ def test_id_token_auth_hash
         id_token.stubs(:verify!).returns(true)
         id_token.stubs(:raw_attributes, :to_h).returns(
           {
-            "iss": "http://server.example.com",
-            "sub": "248289761001",
-            "aud": "s6BhdRkqt3",
-            "nonce": "n-0S6_WzA2Mj",
-            "exp": 1311281970,
-            "iat": 1311280970,
+            "iss": 'http://server.example.com',
+            "sub": '248289761001',
+            "aud": 's6BhdRkqt3',
+            "nonce": 'n-0S6_WzA2Mj',
+            "exp": 1_311_281_970,
+            "iat": 1_311_280_970,
           }
         )
 

test/strategy_test_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class StrategyTestCase < MiniTest::Test
   class DummyApp
     def call(env); end
@@ -24,9 +26,9 @@ def user_info
       given_name: Faker::Name.first_name,
       family_name: Faker::Name.last_name,
       gender: 'female',
-      picture: Faker::Internet.url + '.png',
+      picture: "#{Faker::Internet.url}.png",
       phone_number: Faker::PhoneNumber.phone_number,
-      website: Faker::Internet.url,
+      website: Faker::Internet.url
     )
   end
 

test/test_helper.rb

@@ -1,4 +1,6 @@
-lib = File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'simplecov'