Merge branch 'topic-fix-state-specs' of github.com:jjulian/omniauth-oauth2 into jjulian-topic-fix-state-specs

Author: tmilewski

spec/omniauth/strategies/oauth2_spec.rb

@@ -14,7 +14,7 @@ def app; lambda{|env| [200, {}, ["Hello."]]} end
 
   describe '#client' do
     subject{ fresh_strategy }
-
+ 
     it 'should be initialized with symbolized client_options' do
       instance = subject.new(app, :client_options => {'authorize_url' => 'https://example.com'})
       instance.client.options[:authorize_url].should == 'https://example.com'
@@ -30,20 +30,21 @@ def app; lambda{|env| [200, {}, ["Hello."]]} end
     subject { fresh_strategy }
 
     it 'should include any authorize params passed in the :authorize_params option' do
-      instance = subject.new('abc', 'def', :authorize_params => {:foo => 'bar', :baz => 'zip', :state => '123'})
-      instance.authorize_params.should == {'foo' => 'bar', 'baz' => 'zip', 'state' => '123'}
+      instance = subject.new('abc', 'def', :authorize_params => {:foo => 'bar', :baz => 'zip'})
+      instance.authorize_params['foo'].should == 'bar'
+      instance.authorize_params['baz'].should == 'zip'
     end
 
     it 'should include top-level options that are marked as :authorize_options' do
-      instance = subject.new('abc', 'def', :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz', :authorize_params => {:state => '123'})
-      instance.authorize_params.should == {'scope' => 'bar', 'foo' => 'baz', 'state' => '123'}
+      instance = subject.new('abc', 'def', :authorize_options => [:scope, :foo, :state], :scope => 'bar', :foo => 'baz')
+      instance.authorize_params['scope'].should == 'bar'
+      instance.authorize_params['foo'].should == 'baz'
     end
 
     it 'should include random state in the authorize params' do
       instance = subject.new('abc', 'def')
       instance.authorize_params.keys.should == ['state']
       instance.session['omniauth.state'].should_not be_empty
-      instance.session['omniauth.state'].should == instance.authorize_params['state']
     end
   end