restforce 2.5.4 → 4.0.0

data/spec/integration/data/client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples_for Restforce::Data::Client do
@@ -8,15 +10,20 @@ shared_examples_for Restforce::Data::Client do
     context 'when given a picklist field' do
       subject { client.picklist_values('Account', 'Picklist_Field') }
       it { should be_an Array }
-      its(:length) { should eq 3 }
-      it { should include_picklist_values %w(one two three) }
+      its(:length) { should eq 10 }
+      it {
+        should include_picklist_values %w[
+          one two three control_four control_five
+          control_six control_seven control_eight control_nine control_ten
+        ]
+      }
     end
 
     context 'when given a multipicklist field' do
       subject { client.picklist_values('Account', 'Picklist_Multiselect_Field') }
       it { should be_an Array }
       its(:length) { should eq 3 }
-      it { should include_picklist_values %w(four five six) }
+      it { should include_picklist_values %w[four five six] }
     end
 
     describe 'dependent picklists' do
@@ -29,10 +36,22 @@ shared_examples_for Restforce::Data::Client do
 
         it { should be_an Array }
         its(:length) { should eq 2 }
-        it { should include_picklist_values %w(seven eight) }
+        it { should include_picklist_values %w[seven eight] }
         it { should_not include_picklist_values ['nine'] }
       end
 
+      context 'when given a picklist field that has a dependency index greater than 8' do
+        subject do
+          client.picklist_values('Account',
+                                 'Dependent_Picklist_Field',
+                                 valid_for: 'control_ten')
+        end
+
+        it { should be_an Array }
+        its(:length) { should eq 1 }
+        it { should include_picklist_values %w[ten] }
+      end
+
       context 'when given a picklist field that does not have a dependency' do
         subject do
           client.picklist_values('Account', 'Picklist_Field', valid_for: 'one')
@@ -90,7 +109,7 @@ shared_examples_for Restforce::Data::Client do
       it 'subscribes to each pushtopic' do
         client.faye.should_receive(:subscribe).with(['/topic/PushTopic1',
                                                      '/topic/PushTopic2'])
-        client.subscribe(%w(PushTopic1 PushTopic2))
+        client.subscribe(%w[PushTopic1 PushTopic2])
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start
 

data/spec/support/client_integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClientIntegrationExampleGroup
   def self.included(base)
     base.class_eval do

data/spec/support/concerns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ConcernsExampleGroup
   def self.included(base)
     base.class_eval do

data/spec/support/event_machine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before do
     EventMachine.stub(:connect) if defined?(EventMachine)

data/spec/support/fixture_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FixtureHelpers
   module InstanceMethods
     def stub_api_request(endpoint, options = {})
@@ -25,8 +27,8 @@ module FixtureHelpers
       stub
     end
 
-    def fixture(f)
-      File.read(File.expand_path("../../fixtures/#{f}.json", __FILE__))
+    def fixture(filename)
+      File.read(File.expand_path("../../fixtures/#{filename}.json", __FILE__))
     end
   end
 

data/spec/support/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :include_picklist_values do |expected|
   match do |actual|
     actual.all? { |picklist_value| expected.include? picklist_value['value'] }

data/spec/support/middleware.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module MiddlewareExampleGroup
   def self.included(base)
     base.class_eval do
-      let(:app)            { double('@app', call: nil)            }
+      let(:app)            { double('@app', call: nil) }
       let(:env)            { { request_headers: {}, response_headers: {} } }
       let(:retries)        { 3 }
       let(:options)        { {} }

data/spec/support/mock_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MockCache
   def initialize
     @storage = {}
@@ -11,8 +13,8 @@ class MockCache
     @storage[key] = value
   end
 
-  def fetch(key, &block)
-    @storage[key] ||= block.call
+  def fetch(key)
+    @storage[key] ||= yield
   end
 
   def delete(key)

data/spec/unit/abstract_client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restforce::AbstractClient do

data/spec/unit/attachment_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restforce::Attachment do

data/spec/unit/collection_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restforce::Collection do
@@ -16,7 +18,7 @@ describe Restforce::Collection do
       its(:page_size)      { should eq 1 }
 
       describe 'each record' do
-        it { should be_all { |record| expect(record).to be_a Restforce::SObject } }
+        it { should(be_all { |record| expect(record).to be_a Restforce::SObject }) }
       end
     end
 
@@ -51,11 +53,11 @@ describe Restforce::Collection do
         end
 
         its(:pages) do
-          should be_all { |page| expect(page).to be_a Restforce::Collection }
+          should(be_all { |page| expect(page).to be_a Restforce::Collection })
         end
 
         its(:has_next_page?) { should be_true }
-        it { should be_all   { |record| expect(record).to be_a Restforce::SObject } }
+        it { should(be_all { |record| expect(record).to be_a Restforce::SObject }) }
         its(:next_page)      { should be_a Restforce::Collection }
       end
     end

data/spec/unit/concerns/api_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restforce::Concerns::API do
@@ -27,7 +29,7 @@ describe Restforce::Concerns::API do
     it 'returns the body' do
       start_string = '2002-10-31T00:02:02Z'
       end_string = '2003-10-31T00:02:02Z'
-      url = "/sobjects/Whizbang/updated/?start=#{start_string}&end=#{end_string}"
+      url = "sobjects/Whizbang/updated/?start=#{start_string}&end=#{end_string}"
       client.should_receive(:api_get).
         with(url).
         and_return(response)
@@ -43,7 +45,7 @@ describe Restforce::Concerns::API do
     it 'returns the body' do
       start_string = '2002-10-31T00:02:02Z'
       end_string = '2003-10-31T00:02:02Z'
-      url = "/sobjects/Whizbang/deleted/?start=#{start_string}&end=#{end_string}"
+      url = "sobjects/Whizbang/deleted/?start=#{start_string}&end=#{end_string}"
       client.should_receive(:api_get).
         with(url).
         and_return(response)
@@ -259,7 +261,7 @@ describe Restforce::Concerns::API do
     end
   end
 
-  [:create, :update, :upsert, :destroy].each do |method|
+  %i[create update upsert destroy].each do |method|
     describe ".#{method}" do
       let(:args)       { [] }
       subject(:result) { client.send(method, *args) }
@@ -289,7 +291,7 @@ describe Restforce::Concerns::API do
 
     describe '.create!' do
       let(:sobject)    { 'Whizbang' }
-      let(:attrs)      { Hash.new }
+      let(:attrs)      { {} }
       subject(:result) { client.create!(sobject, attrs) }
 
       it 'send an HTTP POST, and returns the id of the record' do
@@ -303,7 +305,7 @@ describe Restforce::Concerns::API do
 
     describe '.update!' do
       let(:sobject)    { 'Whizbang' }
-      let(:attrs)      { Hash.new }
+      let(:attrs)      { {} }
       subject(:result) { client.update!(sobject, attrs) }
 
       context 'when the id field is present' do
@@ -342,17 +344,27 @@ describe Restforce::Concerns::API do
 
       context 'when the record is found and updated' do
         it 'returns true' do
-          response.body.stub :[]
+          response.stub(:body) { {} }
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/External_ID__c/1234', {}).
             and_return(response)
           expect(result).to be_true
         end
+
+        context 'and the response body is a string' do
+          it 'returns true' do
+            response.stub(:body) { '' }
+            client.should_receive(:api_patch).
+              with('sobjects/Whizbang/External_ID__c/1234', {}).
+              and_return(response)
+            expect(result).to be_true
+          end
+        end
       end
 
       context 'when the record is found and created' do
         it 'returns the id of the record' do
-          response.body.stub(:[]).with('id').and_return('4321')
+          response.stub(:body) { { "id" => "4321" } }
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/External_ID__c/1234', {}).
             and_return(response)
@@ -361,7 +373,7 @@ describe Restforce::Concerns::API do
       end
 
       context 'when the external id field is missing from the attrs' do
-        let(:attrs) { Hash.new }
+        let(:attrs) { {} }
 
         it 'raises an argument error' do
           expect { client.upsert!(sobject, field, attrs) }.
@@ -376,7 +388,7 @@ describe Restforce::Concerns::API do
 
         context 'and the value for Id is provided' do
           it 'returns the id of the record, and original record still contains id' do
-            response.body.stub(:[]).with('id').and_return('4321')
+            response.stub(:body) { { "id" => "4321" } }
             client.should_receive(:api_patch).
               with('sobjects/Whizbang/Id/4321', {}).
               and_return(response)
@@ -389,7 +401,7 @@ describe Restforce::Concerns::API do
           let(:attrs) { { 'External_ID__c' => '1234' } }
 
           it 'uses POST to create the record' do
-            response.body.stub(:[]).with('id').and_return('4321')
+            response.stub(:body) { { "id" => "4321" } }
             client.should_receive(:options).and_return(api_version: 38.0)
             client.should_receive(:api_post).
               with('sobjects/Whizbang/Id', attrs).
@@ -415,7 +427,7 @@ describe Restforce::Concerns::API do
 
       context 'when the record is found and updated' do
         it 'returns true' do
-          response.body.stub :[]
+          response.stub(:body) { {} }
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/External_ID__c/%E3%81%82', {}).
             and_return(response)
@@ -423,6 +435,23 @@ describe Restforce::Concerns::API do
         end
       end
     end
+
+    describe '.upsert! with Fixnum argument' do
+      let(:sobject)    { 'Whizbang' }
+      let(:field)      { :External_ID__c }
+      let(:attrs)      { { 'External_ID__c' => 1234 } }
+      subject(:result) { client.upsert!(sobject, field, attrs) }
+
+      context 'when the record is found and updated' do
+        it 'returns true' do
+          response.stub(:body) { {} }
+          client.should_receive(:api_patch).
+            with('sobjects/Whizbang/External_ID__c/1234', {}).
+            and_return(response)
+          expect(result).to be_true
+        end
+      end
+    end
   end
 
   describe '.destroy!' do

data/spec/unit/concerns/authentication_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restforce::Concerns::Authentication do
@@ -54,7 +56,7 @@ describe Restforce::Concerns::Authentication do
 
   describe '.username_password?' do
     subject       { client.username_password? }
-    let(:options) { Hash.new }
+    let(:options) { {} }
 
     before do
       client.stub options: options
@@ -78,7 +80,7 @@ describe Restforce::Concerns::Authentication do
 
   describe '.oauth_refresh?' do
     subject       { client.oauth_refresh? }
-    let(:options) { Hash.new }
+    let(:options) { {} }
 
     before do
       client.stub options: options

data/spec/unit/concerns/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restforce::Concerns::Base do

data/spec/unit/concerns/batch_api_spec.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Restforce::Concerns::BatchAPI do
+  let(:endpoint) { 'composite/batch' }
+
+  before do
+    client.should_receive(:options).and_return(api_version: 34.0)
+  end
+
+  shared_examples_for 'batched requests' do
+    it '#create' do
+      client.
+        should_receive(:api_post).
+        with(endpoint, { batchRequests: [
+          { method: 'POST', url: 'v34.0/sobjects/Object', richInput: { name: 'test' } }
+        ], haltOnError: halt_on_error }.to_json).
+        and_return(response)
+
+      client.send(method) do |subrequests|
+        subrequests.create('Object', name: 'test')
+      end
+    end
+
+    it '#update' do
+      client.
+        should_receive(:api_post).
+        with(endpoint, { batchRequests: [
+          { method: 'PATCH', url: "v34.0/sobjects/Object/123", richInput: {
+            name: 'test'
+          } }
+        ], haltOnError: halt_on_error }.to_json).
+        and_return(response)
+
+      client.send(method) do |subrequests|
+        subrequests.update('Object', id: '123', name: 'test')
+      end
+    end
+
+    it '#destroy' do
+      client.
+        should_receive(:api_post).
+        with(endpoint, { batchRequests: [
+          { method: 'DELETE', url: "v34.0/sobjects/Object/123" }
+        ], haltOnError: halt_on_error }.to_json).
+        and_return(response)
+
+      client.send(method) do |subrequests|
+        subrequests.destroy('Object', '123')
+      end
+    end
+
+    it '#upsert' do
+      client.
+        should_receive(:api_post).
+        with(endpoint, { batchRequests: [
+          { method: 'PATCH', url: 'v34.0/sobjects/Object/extIdField__c/456', richInput: {
+            name: 'test'
+          } }
+        ], haltOnError: halt_on_error }.to_json).
+        and_return(response)
+
+      client.send(method) do |subrequests|
+        subrequests.upsert('Object', 'extIdField__c',
+                           extIdField__c: '456', name: 'test')
+      end
+    end
+
+    it 'multiple subrequests' do
+      client.
+        should_receive(:api_post).
+        with(endpoint, { batchRequests: [
+          { method: 'POST', url: 'v34.0/sobjects/Object', richInput: {
+            name: 'test'
+          } },
+          { method: 'PATCH', url: "v34.0/sobjects/Object/123", richInput: {
+            name: 'test'
+          } },
+          { method: 'DELETE', url: "v34.0/sobjects/Object/123" }
+        ], haltOnError: halt_on_error }.to_json).
+        and_return(response)
+
+      client.send(method) do |subrequests|
+        subrequests.create('Object', name: 'test')
+        subrequests.update('Object', id: '123', name: 'test')
+        subrequests.destroy('Object', '123')
+      end
+    end
+  end
+
+  describe '#batch' do
+    let(:method) { :batch }
+    let(:halt_on_error) { false }
+    let(:response) { double('Faraday::Response', body: { 'results' => [] }) }
+    it_behaves_like 'batched requests'
+  end
+
+  describe '#batch!' do
+    let(:method) { :batch! }
+    let(:halt_on_error) { true }
+    let(:response) {
+      double('Faraday::Response', body: { 'hasErrors' => false, 'results' => [] })
+    }
+    it_behaves_like 'batched requests'
+  end
+end