spark_api 1.4.29 → 1.5.1

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ end
 
 require "rubygems"
 require "rspec"
-require 'rspec/autorun'
 require 'webmock/rspec'
 require "json"
 require 'multi_json'
@@ -22,6 +21,13 @@ require path + '/spark_api'
 
 require 'spark_api'
 
+if ENV['COVERAGE'] == "on"
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start { add_filter %w(/vendor /spec /test) }
+end
+
 FileUtils.mkdir 'log' unless File.exists? 'log'
 
 module SparkApi
@@ -48,17 +54,16 @@ end
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
   config.include WebMock::API
   config.include StubApiRequests
 
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.alias_example_to :on_get_it, :method => 'GET'
   config.alias_example_to :on_put_it, :method => 'PUT'
   config.alias_example_to :on_post_it, :method => 'POST'
   config.alias_example_to :on_delete_it, :method => 'DELETE'
   config.before(:all) { reset_config }
-  config.color_enabled = true
+  config.color = true
 end
 
 def jruby? 

data/spec/unit/spark_api/authentication/api_auth_spec.rb

@@ -4,15 +4,14 @@ describe SparkApi::Authentication::ApiAuth  do
   subject {SparkApi::Authentication::ApiAuth.new(nil) }
   describe "build_param_hash" do
     it "should return a blank string when passed nil" do
-      subject.build_param_string(nil).should be_empty
+      expect(subject.build_param_string(nil)).to be_empty
     end
     it "should return a correct param string for one item" do
-      subject.build_param_string({:foo => "bar"}).should match("foobar")
+      expect(subject.build_param_string({:foo => "bar"})).to match("foobar")
     end
     it "should alphabatize the param names by key first, then by value" do
-      subject.build_param_string({:zoo => "zar", :ooo => "car"}).should match("ooocarzoozar")
-      subject.build_param_string({:Akey => "aValue", :aNotherkey => "AnotherValue"}).should 
-           match "AkeyaValueaNotherkeyAnotherValue"
+      expect(subject.build_param_string({:zoo => "zar", :ooo => "car"})).to match("ooocarzoozar")
+      expect(subject.build_param_string({:Akey => "aValue", :aNotherkey => "AnotherValue"})).to match("AkeyaValueaNotherkeyAnotherValue")
     end
   end
   
@@ -33,7 +32,7 @@ describe SparkApi::Authentication::ApiAuth  do
       stub_request(:post, "https://api.sparkapi.com/#{SparkApi.version}/session").
                   with(:query => {:ApiKey => "my_key", :ApiSig => "c731cf2455fbc7a4ef937b2301108d7a"}).
                   to_return(:body => fixture("authentication_failure.json"), :status=>401)
-      expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| e.status.should == 401 }
+      expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(401) }
     end
   end
 
@@ -41,16 +40,16 @@ describe SparkApi::Authentication::ApiAuth  do
     let(:session) { Object.new }
     it "should return true when session is active" do
       subject.session = session
-      session.stub(:expired?) { false }
-      subject.authenticated?.should eq(true)
+      allow(session).to receive(:expired?) { false }
+      expect(subject.authenticated?).to eq(true)
     end
     it "should return false when session is expired" do
       subject.session = session
-      session.stub(:expired?) { true }
-      subject.authenticated?.should eq(false)
+      allow(session).to receive(:expired?) { true }
+      expect(subject.authenticated?).to eq(false)
     end
     it "should return false when session is uninitialized" do
-      subject.authenticated?.should eq(false)
+      expect(subject.authenticated?).to eq(false)
     end
   end
 
@@ -61,14 +60,14 @@ describe SparkApi::Authentication::ApiAuth  do
     it "should logout when there is an active session" do
       logged_out = false
       subject.session = session
-      client.stub(:delete).with("/session/1234") { logged_out = true }
+      allow(client).to receive(:delete).with("/session/1234") { logged_out = true }
       subject.logout
-      subject.session.should eq(nil)
-      logged_out.should eq(true)
+      expect(subject.session).to eq(nil)
+      expect(logged_out).to eq(true)
     end
     it "should skip logging out when there is no active session information" do 
-      client.stub(:delete) { raise "Should not be called" }
-      subject.logout.should eq(nil)
+      allow(client).to receive(:delete) { raise "Should not be called" }
+      expect(subject.logout).to eq(nil)
     end
   end
   
@@ -98,7 +97,7 @@ describe SparkApi::Authentication::ApiAuth  do
           :AuthToken => "1234"}.merge(args)).
         to_return(:body => fixture("listings/no_subresources.json"))
       subject.session = session
-      subject.request(:get, "/#{SparkApi.version}/listings", nil, args).status.should eq(200)
+      expect(subject.request(:get, "/#{SparkApi.version}/listings", nil, args).status).to eq(200)
     end
     it "should handle a post request" do
       stub_auth_request
@@ -118,14 +117,14 @@ describe SparkApi::Authentication::ApiAuth  do
             }]}
           }', 
           :status=>201)
-      subject.request(:post, "/#{SparkApi.version}/contacts", contact, args).status.should eq(201)
+      expect(subject.request(:post, "/#{SparkApi.version}/contacts", contact, args).status).to eq(201)
     end
   end
   
   describe "sign" do
     it "should sign the auth parameters correctly" do
       sign_token = "my_secretApiKeymy_key"
-      subject.sign(sign_token).should eq("c731cf2455fbc7a4ef937b2301108d7a")
+      expect(subject.sign(sign_token)).to eq("c731cf2455fbc7a4ef937b2301108d7a")
     end
   end
   
@@ -134,7 +133,7 @@ describe SparkApi::Authentication::ApiAuth  do
     subject {SparkApi::Authentication::ApiAuth.new(client) }
     it "should fully sign the token" do
       parms = {:AuthToken => "1234", :ApiUser => "CoolAsIce"}
-      subject.sign_token("/test", parms).should eq("7bbe3384a8b64368357f8551cab271e3")
+      expect(subject.sign_token("/test", parms)).to eq("7bbe3384a8b64368357f8551cab271e3")
     end
   end
   
@@ -160,8 +159,8 @@ describe SparkApi::Authentication::ApiAuth  do
           to_return(:body => fixture('listings/with_documents.json'))
       l = Listing.find('1234', :_expand => "Documents")
       
-      count.should eq(2)
-      SparkApi.client.session.expired?.should eq(false)
+      expect(count).to eq(2)
+      expect(SparkApi.client.session.expired?).to eq(false)
     end
   end
   

data/spec/unit/spark_api/authentication/base_auth_spec.rb

@@ -3,8 +3,8 @@ require './spec/spec_helper'
 describe SparkApi::Authentication::BaseAuth  do
   subject {SparkApi::Authentication::BaseAuth.new(nil) }
   it "should raise an error" do
-    expect {subject.authenticate()}.to raise_error(){ |e| e.message.should == "Implement me!"}
-    expect {subject.logout()}.to raise_error(){ |e| e.message.should == "Implement me!"}
-    expect {subject.request(nil, nil, nil, nil)}.to raise_error(){ |e| e.message.should == "Implement me!"}
+    expect {subject.authenticate()}.to raise_error(){ |e| expect(e.message).to eq("Implement me!")}
+    expect {subject.logout()}.to raise_error(){ |e| expect(e.message).to eq("Implement me!")}
+    expect {subject.request(nil, nil, nil, nil)}.to raise_error(){ |e| expect(e.message).to eq("Implement me!")}
   end
 end

data/spec/unit/spark_api/authentication/oauth2_impl/faraday_middleware_spec.rb

@@ -10,7 +10,7 @@ describe SparkApi::Authentication::OAuth2Impl::SparkbarFaradayMiddleware do
       :status => 201
     }
     subject.on_complete env
-    env[:body]["token"].should eq("sp4rkb4rt0k3n")
+    expect(env[:body]["token"]).to eq("sp4rkb4rt0k3n")
   end
   
   it "should raise error on unsuccessful response" do

data/spec/unit/spark_api/authentication/oauth2_impl/grant_type_base_spec.rb

@@ -4,6 +4,6 @@ describe SparkApi::Authentication::OAuth2Impl::GrantTypeBase do
   subject { SparkApi::Authentication::OAuth2Impl::GrantTypeBase }
   # Make sure the client boostraps the right plugin based on configuration.
   it "create should " do
-    expect {subject.create(nil, InvalidAuth2Provider.new())}.to  raise_error(SparkApi::ClientError){ |e| e.message.should == "Unsupported grant type [not_a_real_type]" }
+    expect {subject.create(nil, InvalidAuth2Provider.new())}.to  raise_error(SparkApi::ClientError){ |e| expect(e.message).to eq("Unsupported grant type [not_a_real_type]") }
   end
 end

data/spec/unit/spark_api/authentication/oauth2_impl/single_session_provider_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe SparkApi::Authentication::SingleSessionProvider do
   subject { SparkApi::Authentication::SingleSessionProvider.new({ :access_token => "the_token" }) }
   it "should initialize a new session with access_token" do
-    subject.load_session.should respond_to(:access_token)
-    subject.load_session.access_token.should eq("the_token")
+    expect(subject.load_session).to respond_to(:access_token)
+    expect(subject.load_session.access_token).to eq("the_token")
   end
 end

data/spec/unit/spark_api/authentication/oauth2_spec.rb

@@ -11,7 +11,7 @@ describe SparkApi::Authentication::OAuth2  do
   # Make sure the client boostraps the right plugin based on configuration.
   describe "plugin" do
     it "should load the oauth2 authenticator" do
-      client.authenticator.class.should eq(SparkApi::Authentication::OAuth2)
+      expect(client.authenticator.class).to eq(SparkApi::Authentication::OAuth2)
     end
   end
   describe "authenticate" do
@@ -21,8 +21,8 @@ describe SparkApi::Authentication::OAuth2  do
           '{"client_id":"example-id","client_secret":"example-password","code":"my_code","grant_type":"authorization_code","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback"}' 
         ).
         to_return(:body => fixture("oauth2/access.json"), :status=>200)
-      subject.authenticate.access_token.should eq("04u7h-4cc355-70k3n")
-      subject.authenticate.expires_in.should eq(57600)
+      expect(subject.authenticate.access_token).to eq("04u7h-4cc355-70k3n")
+      expect(subject.authenticate.expires_in).to eq(57600)
     end
     
     it "should raise an error when api credentials are invalid" do
@@ -31,7 +31,7 @@ describe SparkApi::Authentication::OAuth2  do
           '{"client_id":"example-id","client_secret":"example-password","code":"my_code","grant_type":"authorization_code","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback"}'
         ).
         to_return(:body => fixture("oauth2/error.json"), :status=>400)
-      expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| e.status.should == 400 }
+      expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(400) }
     end
     
   end
@@ -40,16 +40,16 @@ describe SparkApi::Authentication::OAuth2  do
     let(:session) { Object.new }
     it "should return true when session is active" do
       subject.session = session
-      session.stub(:expired?) { false }
-      subject.authenticated?.should eq(true)
+      allow(session).to receive(:expired?) { false }
+      expect(subject.authenticated?).to eq(true)
     end
     it "should return false when session is expired" do
       subject.session = session
-      session.stub(:expired?) { true }
-      subject.authenticated?.should eq(false)
+      allow(session).to receive(:expired?) { true }
+      expect(subject.authenticated?).to eq(false)
     end
     it "should return false when session is uninitialized" do
-      subject.authenticated?.should eq(false)
+      expect(subject.authenticated?).to eq(false)
     end
   end
 
@@ -58,11 +58,11 @@ describe SparkApi::Authentication::OAuth2  do
     it "should logout when there is an active session" do
       subject.session = session
       subject.logout
-      subject.session.should eq(nil)
+      expect(subject.session).to eq(nil)
     end
     it "should skip logging out when there is no active session information" do 
-      client.stub(:delete) { raise "Should not be called" }
-      subject.logout.should eq(nil)
+      allow(client).to receive(:delete) { raise "Should not be called" }
+      expect(subject.logout).to eq(nil)
     end
   end
   
@@ -79,7 +79,7 @@ describe SparkApi::Authentication::OAuth2  do
         with(:query => args).
         to_return(:body => fixture("listings/no_subresources.json"))
       subject.session = session
-      subject.request(:get, "/#{SparkApi.version}/listings", nil, args).status.should eq(200)
+      expect(subject.request(:get, "/#{SparkApi.version}/listings", nil, args).status).to eq(200)
     end
     it "should handle a post request" do
       subject.session = session
@@ -95,7 +95,7 @@ describe SparkApi::Authentication::OAuth2  do
             }]}
           }', 
           :status=>201)
-      subject.request(:post, "/#{SparkApi.version}/contacts", contact, args).status.should eq(201)
+      expect(subject.request(:post, "/#{SparkApi.version}/contacts", contact, args).status).to eq(201)
     end
   end
   
@@ -106,7 +106,7 @@ describe SparkApi::Authentication::OAuth2  do
         with(:body => "access_token=#{session.access_token}").
         to_return(:body => '{"token":"sp4rkb4rt0k3n"}')
       subject.session = session
-      subject.sparkbar_token.should eq("sp4rkb4rt0k3n")
+      expect(subject.sparkbar_token).to eq("sp4rkb4rt0k3n")
     end
     it "should raise an error on missing sparkbar token" do
       c = stub_request(:post, "https://test.sparkplatform.com/appbar/authorize").
@@ -142,9 +142,9 @@ describe SparkApi::Authentication::OAuth2  do
           to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
           to_return(:body => fixture('listings/with_documents.json'))
         client.get("/listings/1234")
-        count.should eq(1)
-        refresh_count.should eq(1)
-        client.session.expired?.should eq(false)
+        expect(count).to eq(1)
+        expect(refresh_count).to eq(1)
+        expect(client.session.expired?).to eq(false)
       end
     end
     context "and an invalid refresh token" do
@@ -164,8 +164,8 @@ describe SparkApi::Authentication::OAuth2  do
           to_return(:body => fixture('listings/with_documents.json'))
               
         client.get("/listings/1234")
-        count.should eq(2)
-        client.session.expired?.should eq(false)
+        expect(count).to eq(2)
+        expect(client.session.expired?).to eq(false)
       end
     end
   end
@@ -186,16 +186,16 @@ describe SparkApi::Authentication::OpenIdOAuth2Hybrid do
   end
   describe "plugin" do
     it "should load the hybrid authenticator" do
-      client.authenticator.class.should eq(SparkApi::Authentication::OpenIdOAuth2Hybrid)
+      expect(client.authenticator.class).to eq(SparkApi::Authentication::OpenIdOAuth2Hybrid)
     end
   end
 
   describe "#authorization_url" do
     it "should include combined flow parameter" do
-      client.authenticator.authorization_url.should match("openid.spark.combined_flow=true")
+      expect(client.authenticator.authorization_url).to match("openid.spark.combined_flow=true")
     end
     it "should allow custom parameters" do
-      client.authenticator.authorization_url({"joshua" => "iscool"}).should match("joshua=iscool")
+      expect(client.authenticator.authorization_url({"joshua" => "iscool"})).to match("joshua=iscool")
     end
   end
 end
@@ -215,24 +215,24 @@ describe SparkApi::Authentication::OpenId do
 
   describe "plugin" do
     it "should not include combined flow parameter" do
-      client.authenticator.authorization_url.should_not match("openid.spark.combined_flow=true")
+      expect(client.authenticator.authorization_url).not_to match("openid.spark.combined_flow=true")
     end
     it "should load the oauth2 authenticator" do
-      client.authenticator.class.should eq(SparkApi::Authentication::OpenId)
+      expect(client.authenticator.class).to eq(SparkApi::Authentication::OpenId)
     end
   end
 
   describe "#authorization_url" do
     it "should allow custom parameters" do
-      client.authenticator.authorization_url({"joshua" => "iscool"}).should match("joshua=iscool")
+      expect(client.authenticator.authorization_url({"joshua" => "iscool"})).to match("joshua=iscool")
     end
   end
 
   describe "forbidden methods" do
     it "should not allow authentication" do
-      lambda {
+      expect {
         client.authenticate
-      }.should raise_error(RuntimeError)
+      }.to raise_error(RuntimeError)
     end
   end
 end
@@ -240,12 +240,12 @@ end
 describe SparkApi::Authentication::BaseOAuth2Provider  do
   context "session_timeout" do
     it "should provide a default" do
-      subject.session_timeout.should eq(86400)
+      expect(subject.session_timeout).to eq(86400)
     end
     describe TestOAuth2Provider do
       subject { TestOAuth2Provider.new }
       it "should be able to override the session timeout" do
-        subject.session_timeout.should eq(57600)
+        expect(subject.session_timeout).to eq(57600)
       end
     end
   end
@@ -260,18 +260,18 @@ describe "password authentication" do
       with(:body =>
         '{"client_id":"example-id","client_secret":"example-secret","grant_type":"password","password":"example-password","username":"example-user"}' 
       ).to_return(:body => fixture("oauth2/access.json"), :status=>200)
-    subject.authenticate.access_token.should eq("04u7h-4cc355-70k3n")
-    subject.authenticate.expires_in.should eq(60)
+    expect(subject.authenticate.access_token).to eq("04u7h-4cc355-70k3n")
+    expect(subject.authenticate.expires_in).to eq(60)
   end
 end
 describe SparkApi::Authentication::OAuth2Impl  do
   it "should load a provider" do
     example = "SparkApi::Authentication::OAuth2Impl::CLIProvider"
-    SparkApi::Authentication::OAuth2Impl.load_provider(example,{}).class.to_s.should eq(example)
+    expect(SparkApi::Authentication::OAuth2Impl.load_provider(example,{}).class.to_s).to eq(example)
     prefix = "::#{example}"
-    SparkApi::Authentication::OAuth2Impl.load_provider(prefix,{}).class.to_s.should eq(example)
+    expect(SparkApi::Authentication::OAuth2Impl.load_provider(prefix,{}).class.to_s).to eq(example)
     bad_example = "Derp::Derp::Derp::DerpProvider"
-    expect{SparkApi::Authentication::OAuth2Impl.load_provider(bad_example,{}).class.to_s.should eq(bad_example)}.to raise_error(ArgumentError)
+    expect{expect(SparkApi::Authentication::OAuth2Impl.load_provider(bad_example,{}).class.to_s).to eq(bad_example)}.to raise_error(ArgumentError)
   end
 
 end
@@ -286,8 +286,8 @@ describe SparkApi::Authentication::OAuthSession do
       "start_time" => "2012-01-01T00:00:00+00:00"
     }
     session = SparkApi::Authentication::OAuthSession.new(args)
-    session.start_time.should eq(DateTime.parse(args["start_time"]))
-    JSON.parse(session.to_json).should eq(args)
+    expect(session.start_time).to eq(DateTime.parse(args["start_time"]))
+    expect(JSON.parse(session.to_json)).to eq(args)
   end
 
   it "should accept symbolized parameters" do
@@ -299,12 +299,12 @@ describe SparkApi::Authentication::OAuthSession do
       :start_time => "2012-01-01T00:00:00+00:00"
     }
     session = SparkApi::Authentication::OAuthSession.new(args)
-    session.start_time.should eq(DateTime.parse(args[:start_time]))
-    JSON.parse(session.to_json).should eq(JSON.parse(args.to_json))
+    expect(session.start_time).to eq(DateTime.parse(args[:start_time]))
+    expect(JSON.parse(session.to_json)).to eq(JSON.parse(args.to_json))
   end
 
   it "should not expire if expires_in is nil" do
     session = SparkApi::Authentication::OAuthSession.new
-    session.expired?.should eq(false)
+    expect(session.expired?).to eq(false)
   end
 end

data/spec/unit/spark_api/authentication_spec.rb

@@ -13,7 +13,7 @@ describe SparkApi::Authentication do
     client = SparkApi.client
     stub_auth_request
     session = client.get "/session/c401736bf3d3f754f07c04e460e09573"
-    session[0]["AuthToken"].should eq("c401736bf3d3f754f07c04e460e09573")
+    expect(session[0]["AuthToken"]).to eq("c401736bf3d3f754f07c04e460e09573")
   end
   it "should delete a session" do
     stub_auth_request
@@ -26,7 +26,7 @@ describe SparkApi::Authentication do
       to_return(:body => fixture("success.json"))
     client = SparkApi.client
     client.logout
-    client.session.should eq(nil)
+    expect(client.session).to eq(nil)
   end
 
 end

data/spec/unit/spark_api/configuration/yaml_spec.rb

@@ -4,70 +4,70 @@ describe SparkApi::Configuration::YamlConfig, "Yaml Config"  do
   describe "api auth" do
     let(:api_file){ "spec/config/spark_api/test_key.yml" }
     it "should load a configured api key for development" do
-      subject.stub(:env){ {} }
-      subject.api_env.should eq("development")
+      allow(subject).to receive(:env){ {} }
+      expect(subject.api_env).to eq("development")
       subject.load_file(api_file)
-      subject.oauth2?.should eq(false)
-      subject.ssl_verify?.should eq(false)
-      subject.api_key.should eq("demo_key")
-      subject.api_secret.should eq("t3sts3cr3t")
-      subject.endpoint.should eq("https://developers.sparkapi.com")
-      subject.name.should eq("test_key")
-      subject.client_keys.keys.should =~ [:api_key, :api_secret, :endpoint, :ssl_verify]
-      subject.oauth2_keys.keys.should eq([])
+      expect(subject.oauth2?).to eq(false)
+      expect(subject.ssl_verify?).to eq(false)
+      expect(subject.api_key).to eq("demo_key")
+      expect(subject.api_secret).to eq("t3sts3cr3t")
+      expect(subject.endpoint).to eq("https://developers.sparkapi.com")
+      expect(subject.name).to eq("test_key")
+      expect(subject.client_keys.keys).to match_array([:api_key, :api_secret, :endpoint, :ssl_verify])
+      expect(subject.oauth2_keys.keys).to eq([])
     end
     it "should load a configured api key for production" do
-      subject.stub(:env){ {"SPARK_API_ENV" => "production"} }
-      subject.api_env.should eq("production")
+      allow(subject).to receive(:env){ {"SPARK_API_ENV" => "production"} }
+      expect(subject.api_env).to eq("production")
       subject.load_file(api_file)
-      subject.oauth2?.should eq(false)
-      subject.api_key.should eq("prod_demo_key")
-      subject.api_secret.should eq("prod_t3sts3cr3t")
-      subject.endpoint.should eq("https://api.sparkapi.com")
+      expect(subject.oauth2?).to eq(false)
+      expect(subject.api_key).to eq("prod_demo_key")
+      expect(subject.api_secret).to eq("prod_t3sts3cr3t")
+      expect(subject.endpoint).to eq("https://api.sparkapi.com")
     end
     it "should raise an error for a bad configuration" do
-      subject.stub(:env){ {} }
+      allow(subject).to receive(:env){ {} }
       expect { subject.load_file("spec/config/spark_api/some_random_key.yml")}.to raise_error
-      subject.stub(:env){ {"RAILS_ENV" => "fake_env"} }
+      allow(subject).to receive(:env){ {"RAILS_ENV" => "fake_env"} }
       expect { subject.load_file(api_file)}.to raise_error
     end
   end
   describe "oauth2" do
     let(:oauth2_file){ "spec/config/spark_api/test_oauth.yml" }
     it "should load a configured api key for development" do
-      subject.stub(:env){ {} }
-      subject.api_env.should eq("development")
+      allow(subject).to receive(:env){ {} }
+      expect(subject.api_env).to eq("development")
       subject.load_file(oauth2_file)
-      subject.oauth2?.should eq(true)
-      subject.authorization_uri.should eq("https://developers.sparkplatform.com/oauth2")
-      subject.access_uri.should eq("https://developers.sparkapi.com/v1/oauth2/grant")
-      subject.redirect_uri.should eq("http://localhost/oauth2/callback")
-      subject.client_id.should eq("developmentid124nj4qu3pua")
-      subject.client_secret.should eq("developmentsecret4orkp29f")
-      subject.endpoint.should eq("https://developers.sparkapi.com")
-      subject.oauth2_provider.should eq("SparkApi::TestOAuth2Provider")
-      subject.name.should eq("test_oauth")
-      subject.client_keys.keys.should =~ [:endpoint, :oauth2_provider]
-      subject.oauth2_keys.keys.should =~ [:authorization_uri, :client_id, :access_uri, :client_secret, :redirect_uri, :sparkbar_uri]
+      expect(subject.oauth2?).to eq(true)
+      expect(subject.authorization_uri).to eq("https://developers.sparkplatform.com/oauth2")
+      expect(subject.access_uri).to eq("https://developers.sparkapi.com/v1/oauth2/grant")
+      expect(subject.redirect_uri).to eq("http://localhost/oauth2/callback")
+      expect(subject.client_id).to eq("developmentid124nj4qu3pua")
+      expect(subject.client_secret).to eq("developmentsecret4orkp29f")
+      expect(subject.endpoint).to eq("https://developers.sparkapi.com")
+      expect(subject.oauth2_provider).to eq("SparkApi::TestOAuth2Provider")
+      expect(subject.name).to eq("test_oauth")
+      expect(subject.client_keys.keys).to match_array([:endpoint, :oauth2_provider])
+      expect(subject.oauth2_keys.keys).to match_array([:authorization_uri, :client_id, :access_uri, :client_secret, :redirect_uri, :sparkbar_uri])
     end
     it "should load a configured api key for production" do
-      subject.stub(:env){ {"SPARK_API_ENV" => "production"} }
-      subject.api_env.should eq("production")
+      allow(subject).to receive(:env){ {"SPARK_API_ENV" => "production"} }
+      expect(subject.api_env).to eq("production")
       subject.load_file(oauth2_file)
-      subject.oauth2?.should eq(true)
-      subject.authorization_uri.should eq("https://sparkplatform.com/oauth2")
-      subject.access_uri.should eq("https://api.sparkapi.com/v1/oauth2/grant")
-      subject.redirect_uri.should eq("http://localhost/oauth2/callback")
-      subject.client_id.should eq("production1id124nj4qu3pua")
-      subject.client_secret.should eq("productionsecret4orkp29fv")
-      subject.endpoint.should eq("https://api.sparkapi.com")
-      subject.oauth2_provider.should eq(subject.class::DEFAULT_OAUTH2_PROVIDER)
-      subject.name.should eq("test_oauth")
+      expect(subject.oauth2?).to eq(true)
+      expect(subject.authorization_uri).to eq("https://sparkplatform.com/oauth2")
+      expect(subject.access_uri).to eq("https://api.sparkapi.com/v1/oauth2/grant")
+      expect(subject.redirect_uri).to eq("http://localhost/oauth2/callback")
+      expect(subject.client_id).to eq("production1id124nj4qu3pua")
+      expect(subject.client_secret).to eq("productionsecret4orkp29fv")
+      expect(subject.endpoint).to eq("https://api.sparkapi.com")
+      expect(subject.oauth2_provider).to eq(subject.class::DEFAULT_OAUTH2_PROVIDER)
+      expect(subject.name).to eq("test_oauth")
     end
     
     it "should list available keys" do
-      SparkApi::Configuration::YamlConfig.stub(:config_path) { "spec/config/spark_api" }
-      subject.class.config_keys.should =~ ["test_key", "test_oauth", "test_single_session_oauth"]
+      allow(SparkApi::Configuration::YamlConfig).to receive(:config_path) { "spec/config/spark_api" }
+      expect(subject.class.config_keys).to match_array(["test_key", "test_oauth", "test_single_session_oauth"])
     end
   end
 end