v0.8.2 release.

Author: hhorikawa

test/lib/omniauth/strategies/openid_connect_test.rb

@@ -174,16 +174,20 @@ def test_request_phase_via_http
       def test_option_acr_values
         strategy.options.client_options[:host] = 'foobar.com'
 
-        refute_match /acr_values=/, strategy.authorize_uri, 'URI must not contain acr_values'  #/
+        refute_includes strategy.authorize_params.keys, :acr_values,
+                        'URI must not contain acr_values'  #/
 
         strategy.options.acr_values = 'urn:some:acr:values:value'
-        assert_match /acr_values=/, strategy.authorize_uri, 'URI must contain acr_values'
+        assert_includes strategy.authorize_params.keys, :acr_values,
+                        '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'}
-        assert_match /resource=xyz/, strategy.authorize_uri, 'URI must contain custom params'
+        assert_match 'xyz', strategy.authorize_params[:resource],
+                     'URI must contain custom params'
       end
 
 
@@ -428,11 +432,10 @@ def test_callback_phase_with_invalid_state
 
         strategy.call!('rack.session' => { 'omniauth.state' => state,
                                            'omniauth.nonce' => nonce })
+        strategy.expects(:fail!)
         result = strategy.callback_phase
         assert_kind_of Array, result
         assert_equal 302, result.first, 'Expecting redirect to /callback/failure'
-
-        strategy.expects(:fail!)
       end
 
       def test_callback_phase_without_code
@@ -687,7 +690,8 @@ def test_state
       def test_dynamic_state
         # Stub request parameters
         request.stubs(:path_info).returns('')
-        strategy.call!('rack.session' => { }, QUERY_STRING: { state: 'abc', client_id: '123' } )
+        strategy.call!('rack.session' => { },
+                       Rack::QUERY_STRING => { state: 'abc', client_id: '123' } )
 
         assert_kind_of Array, result
         assert_equal 302, result.first, 'Expecting redirect to /auth/failure'

test/strategy_test_case.rb

@@ -43,13 +43,14 @@ def user_info
 
   def request
     # stub Rack::Request
-    @request ||= Rack::Request.new({}).tap do |request|
-      request.stubs(:params).returns({})
-      request.stubs(:cookies).returns({})
+    @request ||= Rack::Request.new({
+                   'rack.input' => '',
+                   'rack.url_scheme' => 'http'})
+      #request.stubs(:params).returns({})
+      #request.stubs(:cookies).returns({})
       #request.stubs(:env).returns({})     set by ctor
-      request.stubs(:scheme).returns('http')
+      #request.stubs(:scheme).returns('http')
       #request.stubs(:ssl?).returns(false)
-    end
   end
 
   def strategy