restforce 1.5.3 → 2.0.0

data/spec/unit/concerns/authentication_spec.rb

@@ -2,14 +2,17 @@ require 'spec_helper'
 
 describe Restforce::Concerns::Authentication do
   describe '.authenticate!' do
-    subject { lambda { client.authenticate! } }
+    subject(:authenticate!) { client.authenticate! }
 
     context 'when there is no authentication middleware' do
       before do
-        client.stub :authentication_middleware => nil
+        client.stub authentication_middleware: nil
       end
 
-      it { should raise_error Restforce::AuthenticationError, 'No authentication middleware present' }
+      it "raises an error" do
+        expect { authenticate! }.to raise_error Restforce::AuthenticationError,
+                                                'No authentication middleware present'
+      end
     end
 
     context 'when there is authentication middleware' do
@@ -17,12 +20,12 @@ describe Restforce::Concerns::Authentication do
       subject(:result) { client.authenticate! }
 
       it 'authenticates using the middleware' do
-        client.stub :authentication_middleware => authentication_middleware
+        client.stub authentication_middleware: authentication_middleware
         client.stub :options
         authentication_middleware.
           should_receive(:new).
           with(nil, client, client.options).
-          and_return(double(:authenticate! => 'foo'))
+          and_return(double(authenticate!: 'foo'))
         expect(result).to eq 'foo'
       end
     end
@@ -33,7 +36,7 @@ describe Restforce::Concerns::Authentication do
 
     context 'when username and password options are provided' do
       before do
-        client.stub :username_password? => true
+        client.stub username_password?: true
       end
 
       it { should eq Restforce::Middleware::Authentication::Password }
@@ -41,8 +44,8 @@ describe Restforce::Concerns::Authentication do
 
     context 'when oauth options are provided' do
       before do
-        client.stub :username_password? => false
-        client.stub :oauth_refresh? => true
+        client.stub username_password?: false
+        client.stub oauth_refresh?: true
       end
 
       it { should eq Restforce::Middleware::Authentication::Token }
@@ -54,15 +57,15 @@ describe Restforce::Concerns::Authentication do
     let(:options) { Hash.new }
 
     before do
-      client.stub :options => options
+      client.stub options: options
     end
 
     context 'when username and password options are provided' do
       let(:options) do
-        { :username      => 'foo',
-          :password      => 'bar',
-          :client_id     => 'client',
-          :client_secret => 'secret' }
+        { username: 'foo',
+          password: 'bar',
+          client_id: 'client',
+          client_secret: 'secret' }
       end
 
       it { should be_true }
@@ -78,14 +81,14 @@ describe Restforce::Concerns::Authentication do
     let(:options) { Hash.new }
 
     before do
-      client.stub :options => options
+      client.stub options: options
     end
 
     context 'when oauth options are provided' do
       let(:options) do
-        { :refresh_token => 'token',
-          :client_id     => 'client',
-          :client_secret => 'secret' }
+        { refresh_token: 'token',
+          client_id: 'client',
+          client_secret: 'secret' }
       end
 
       it { should be_true }

data/spec/unit/concerns/base_spec.rb

@@ -41,10 +41,10 @@ describe Restforce::Concerns::Base do
 
     context 'when options[:instance_url] is set' do
       before do
-        client.stub :options => { :instance_url => 'foo' }
+        client.stub options: { instance_url: 'foo' }
       end
 
       it { should eq 'foo' }
     end
   end
-end
+end

data/spec/unit/concerns/caching_spec.rb

@@ -5,7 +5,7 @@ describe Restforce::Concerns::Caching do
     let(:options) { double('Options') }
 
     before do
-      client.stub :options => options
+      client.stub options: options
     end
 
     it 'runs the block with caching disabled' do
@@ -26,4 +26,4 @@ describe Restforce::Concerns::Caching do
       end
     end
   end
-end
+end

data/spec/unit/concerns/canvas_spec.rb

@@ -4,7 +4,7 @@ describe Restforce::Concerns::Canvas do
   let(:options) { Hash.new }
 
   before do
-    client.stub :options => options
+    client.stub options: options
   end
 
   describe '.decode_signed_request' do
@@ -12,7 +12,7 @@ describe Restforce::Concerns::Canvas do
     let(:signed_request) { double('Signed Request') }
 
     context 'when the client_secret is set' do
-      let(:options) { { :client_secret => 'secret' } }
+      let(:options) { { client_secret: 'secret' } }
 
       it 'delegates to Restforce::SignedRequest' do
         Restforce::SignedRequest.should_receive(:decode).
@@ -27,4 +27,4 @@ describe Restforce::Concerns::Canvas do
       end
     end
   end
-end
+end

data/spec/unit/concerns/connection_spec.rb

@@ -6,21 +6,20 @@ describe Restforce::Concerns::Connection do
     let(:builder) { double('Faraday::Builder') }
 
     before do
-      client.stub_chain :connection, :builder => builder
+      client.stub_chain :connection, builder: builder
     end
 
     it { should eq builder }
   end
 
   describe 'private #connection' do
-
     describe ':mashify option' do
-      let(:options) { {:adapter => Faraday.default_adapter} }
+      let(:options) { { adapter: Faraday.default_adapter } }
 
       before(:each) do
         client.stub(:authentication_middleware)
         client.stub(:cache)
-        client.stub(:options => options)
+        client.stub(options: options)
       end
 
       describe 'with mashify not specified' do
@@ -32,7 +31,7 @@ describe Restforce::Concerns::Connection do
 
       describe 'with mashify=true' do
         before(:each) do
-          options.merge!(:mashify => true)
+          options.merge!(mashify: true)
         end
 
         it 'includes the Mashify middleware' do
@@ -43,7 +42,7 @@ describe Restforce::Concerns::Connection do
 
       describe 'without mashify' do
         before(:each) do
-          options.merge!(:mashify => false)
+          options.merge!(mashify: false)
         end
 
         it 'does not include the Mashify middleware' do
@@ -56,7 +55,7 @@ describe Restforce::Concerns::Connection do
 
   describe '#adapter' do
     before do
-      client.stub :options => {:adapter => :typhoeus}
+      client.stub options: { adapter: :typhoeus }
     end
 
     its(:adapter) { should eq(:typhoeus) }

data/spec/unit/concerns/streaming_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe Restforce::Concerns::Streaming, :event_machine => true do
+describe Restforce::Concerns::Streaming, event_machine: true do
   describe '.subscribe' do
     let(:channels)        { %w( channel1 channel2 ) }
     let(:topics)          { channels.map { |c| "/topic/#{c}" } }
-    let(:subscribe_block) { lambda{ 'subscribe' } }
+    let(:subscribe_block) { lambda { 'subscribe' } }
     let(:faye_double)     { double('Faye') }
 
     it 'subscribes to the topics with faye' do
       faye_double.
         should_receive(:subscribe).
         with(topics, &subscribe_block)
-      client.stub :faye => faye_double
+      client.stub faye: faye_double
 
       client.subscribe(channels, &subscribe_block)
     end
@@ -22,15 +22,15 @@ describe Restforce::Concerns::Streaming, :event_machine => true do
 
     context 'when authenticate! has already been called' do
       before do
-        client.stub :options => {
-          :instance_url => '/url',
-          :api_version  => '30.0',
-          :oauth_token  => 'secret'
+        client.stub options: {
+          instance_url: '/url',
+          api_version: '30.0',
+          oauth_token: 'secret'
         }
       end
 
       it 'connects to the streaming api' do
-        client.stub :authenticate! => OpenStruct.new({ :access_token => 'secret2' })
+        client.stub authenticate!: OpenStruct.new(access_token: 'secret2')
         faye_double = double('Faye::Client')
         Faye::Client.
           should_receive(:new).

data/spec/unit/config_spec.rb

@@ -43,7 +43,7 @@ describe Restforce do
       end
 
       its(:username)       { should eq 'foo' }
-      its(:password)       { should eq 'bar'}
+      its(:password)       { should eq 'bar' }
       its(:security_token) { should eq 'foobar' }
       its(:client_id)      { should eq 'client id' }
       its(:client_secret)  { should eq 'client secret' }
@@ -53,9 +53,9 @@ describe Restforce do
   end
 
   describe '#configure' do
-    [:username, :password, :security_token, :client_id, :client_secret, :compress, :timeout,
-     :oauth_token, :refresh_token, :instance_url, :api_version, :host, :authentication_retries,
-     :proxy_uri, :authentication_callback, :mashify].each do |attr|
+    [:username, :password, :security_token, :client_id, :client_secret, :compress,
+     :timeout, :oauth_token, :refresh_token, :instance_url, :api_version, :host, :mashify,
+     :authentication_retries, :proxy_uri, :authentication_callback].each do |attr|
       it "allows #{attr} to be set" do
         Restforce.configure do |config|
           config.send("#{attr}=", 'foobar')
@@ -76,7 +76,7 @@ describe Restforce do
   describe '#log' do
     context 'with logging disabled' do
       before do
-        Restforce.stub :log? => false
+        Restforce.stub log?: false
       end
 
       it 'doesnt log anytning' do
@@ -87,7 +87,7 @@ describe Restforce do
 
     context 'with logging enabled' do
       before do
-        Restforce.stub :log? => true
+        Restforce.stub log?: true
         Restforce.configuration.logger.should_receive(:debug).with('foobar')
       end
 

data/spec/unit/data/client_spec.rb

@@ -7,4 +7,4 @@ describe Restforce::Client do
   it { should < Restforce::Concerns::Picklists }
   it { should < Restforce::Concerns::Streaming }
   it { should < Restforce::Concerns::Canvas }
-end
+end

data/spec/unit/mash_spec.rb

@@ -5,7 +5,7 @@ describe Restforce::Mash do
     subject { described_class.build(input, nil) }
 
     context 'when array' do
-      let(:input) { [{ :foo => 'hello' }, { :bar => 'world' }] }
+      let(:input) { [{ foo: 'hello' }, { bar: 'world' }] }
       it { should be_all { |obj| expect(obj).to be_a Restforce::Mash } }
     end
   end

data/spec/unit/middleware/authentication/password_spec.rb

@@ -2,25 +2,27 @@ require 'spec_helper'
 
 describe Restforce::Middleware::Authentication::Password do
   let(:options) do
-    { :host => 'login.salesforce.com',
-      :username => 'foo',
-      :password => 'bar',
-      :security_token => 'security_token',
-      :client_id => 'client_id',
-      :client_secret => 'client_secret' }
+    { host: 'login.salesforce.com',
+      username: 'foo',
+      password: 'bar',
+      security_token: 'security_token',
+      client_id: 'client_id',
+      client_secret: 'client_secret' }
   end
 
   it_behaves_like 'authentication middleware' do
     let(:success_request) do
-      stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token").
-        to_return(:status => 200, :body => fixture(:auth_success_response))
+      stub_login_request(
+        body: "grant_type=password&client_id=client_id&client_secret=client_secret" \
+                 "&username=foo&password=barsecurity_token"
+      ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 
     let(:fail_request) do
-      stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token").
-        to_return(:status => 400, :body => fixture(:auth_error_response))
+      stub_login_request(
+        body: "grant_type=password&client_id=client_id&client_secret=client_secret" \
+                 "&username=foo&password=barsecurity_token"
+      ).to_return(status: 400, body: fixture(:auth_error_response))
     end
   end
 

data/spec/unit/middleware/authentication/token_spec.rb

@@ -2,23 +2,25 @@ require 'spec_helper'
 
 describe Restforce::Middleware::Authentication::Token do
   let(:options) do
-    { :host => 'login.salesforce.com',
-      :refresh_token => 'refresh_token',
-      :client_id => 'client_id',
-      :client_secret => 'client_secret' }
+    { host: 'login.salesforce.com',
+      refresh_token: 'refresh_token',
+      client_id: 'client_id',
+      client_secret: 'client_secret' }
   end
 
   it_behaves_like 'authentication middleware' do
     let(:success_request) do
-      stub_login_request(:body => "grant_type=refresh_token&refresh_token=refresh_token&" \
-        "client_id=client_id&client_secret=client_secret").
-        to_return(:status => 200, :body => fixture(:auth_success_response))
+      stub_login_request(
+        body: "grant_type=refresh_token&refresh_token=refresh_token&" \
+                 "client_id=client_id&client_secret=client_secret"
+      ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 
     let(:fail_request) do
-      stub_login_request(:body => "grant_type=refresh_token&refresh_token=refresh_token&" \
-        "client_id=client_id&client_secret=client_secret").
-        to_return(:status => 400, :body => fixture(:refresh_error_response))
+      stub_login_request(
+        body: "grant_type=refresh_token&refresh_token=refresh_token&" \
+                 "client_id=client_id&client_secret=client_secret"
+      ).to_return(status: 400, body: fixture(:refresh_error_response))
     end
   end
 end

data/spec/unit/middleware/authentication_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Restforce::Middleware::Authentication do
   let(:options) do
-    { :host => 'login.salesforce.com',
-      :proxy_uri => 'https://not-a-real-site.com',
-      :authentication_retries => retries }
+    { host: 'login.salesforce.com',
+      proxy_uri: 'https://not-a-real-site.com',
+      authentication_retries: retries }
   end
 
   describe '.authenticate!' do
-    subject { lambda { middleware.authenticate! }}
+    subject { lambda { middleware.authenticate! } }
     it      { should raise_error NotImplementedError }
   end
 
@@ -25,7 +25,7 @@ describe Restforce::Middleware::Authentication do
 
     context 'when an exception is thrown' do
       before do
-        env.stub :body => 'foo', :request => { :proxy => nil }
+        env.stub body: 'foo', request: { proxy: nil }
         middleware.stub :authenticate!
         app.should_receive(:call).once.
           and_raise(Restforce::UnauthorizedError.new('something bad'))
@@ -49,21 +49,25 @@ describe Restforce::Middleware::Authentication do
 
       context 'with logging disabled' do
         before do
-          Restforce.stub :log? => false
+          Restforce.stub log?: false
         end
 
-        its(:handlers) { should include FaradayMiddleware::ParseJson,
-          Faraday::Adapter::NetHttp }
+        its(:handlers) {
+          should include FaradayMiddleware::ParseJson,
+                         Faraday::Adapter::NetHttp
+        }
         its(:handlers) { should_not include Restforce::Middleware::Logger  }
       end
 
       context 'with logging enabled' do
         before do
-          Restforce.stub :log? => true
+          Restforce.stub log?: true
         end
 
-        its(:handlers) { should include FaradayMiddleware::ParseJson,
-          Restforce::Middleware::Logger, Faraday::Adapter::NetHttp }
+        its(:handlers) {
+          should include FaradayMiddleware::ParseJson,
+                         Restforce::Middleware::Logger, Faraday::Adapter::NetHttp
+        }
       end
     end
   end

data/spec/unit/middleware/authorization_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Restforce::Middleware::Authorization do
-  let(:options) { { :oauth_token => 'token' } }
+  let(:options) { { oauth_token: 'token' } }
 
   describe '.call' do
     subject { lambda { middleware.call(env) } }

data/spec/unit/middleware/gzip_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Restforce::Middleware::Gzip do
-  let(:options) { { :oauth_token => 'token' } }
+  let(:options) { { oauth_token: 'token' } }
 
   # Return a gzipped string.
   def gzip(str)