activeforce 1.10.5 → 2.0.0

data/test/salesforce/connection/soap_api_test.rb

@@ -36,6 +36,7 @@ class Salesforce::Connection::SoapApiTest < ActiveSupport::TestCase
 
   def test_invoke_soap__not_login__success
     options = {
+      :endpoint_url => Salesforce::Config.login_url,
       :body => :soap_body,
       :other_option => 'foo'
     }
@@ -50,29 +51,31 @@ class Salesforce::Connection::SoapApiTest < ActiveSupport::TestCase
     }
     
     expected_result = result[:not_login_response][:result]
-    
-    soap_client_mock = mock
-    Salesforce.connection.expects(:soap_client).with(options).returns(soap_client_mock)
+
+    # stub savon
+    stub_response = stub(:http => stub(:code => 200, :headers => {}, :cookies => []), :body => result)
+    stub_response.stubs(:kind_of?).returns(true)
+
+    Savon::Operation.any_instance.stubs(:create_response).returns(stub_response)
+
+    HTTPI.stubs(:post).with do |request, _|
+      assert_includes request.body, "xmlns:ns1=\"soap:enterprise:namespace\""
+      xml_doc = Nokogiri::XML(request.body)
+      assert_equal 'soap_body', xml_doc.xpath('//wsdl:notLogin/text()').to_s
+      assert_equal 'boyahh_session_id', xml_doc.xpath('//env:Header/ns1:SessionHeader/ns1:sessionId/text()').to_s
+      assert_equal '"notLogin"', request.headers['SOAPAction']
+      assert_equal Salesforce::Config.login_url, request.url.to_s
+    end.returns(stub_response)
 
     Salesforce::Config.stubs(:session_id).returns('boyahh_session_id')
     Salesforce::Config.stubs(:soap_enterprise_namespace).returns('soap:enterprise:namespace')
-
-    soap_mock = mock
-    soap_mock.expects(:body=).with(:soap_body)
-    soap_mock.expects(:header=).with({ "ns1:SessionHeader" => { "ns1:sessionId" => 'boyahh_session_id' }})
-    
-    
-    namespaces_mock = mock
-    namespaces_mock.expects(:[]=).with("xmlns:ns1", 'soap:enterprise:namespace')
-    soap_mock.expects(:namespaces).returns(namespaces_mock)
-    
-    soap_client_mock.expects(:request).with(:wsdl, :notLogin).yields(soap_mock).returns(mock(:to_hash => result))
     
     assert_equal expected_result, Salesforce.connection.send(:invoke_soap, :notLogin, options)    
   end
 
   def test_invoke_soap__not_login__not_success
     options = {
+      :endpoint_url => Salesforce::Config.login_url,
       :body => :soap_body,
       :other_option => 'foo'
     }
@@ -85,23 +88,24 @@ class Salesforce::Connection::SoapApiTest < ActiveSupport::TestCase
         }
       }
     }
-    
-    soap_client_mock = mock
-    Salesforce.connection.expects(:soap_client).with(options).returns(soap_client_mock)
+
+    # stub savon
+    stub_response = stub(:http => stub(:code => 200, :headers => {}, :cookies => []), :body => result)
+    stub_response.stubs(:kind_of?).returns(true)
+
+    Savon::Operation.any_instance.stubs(:create_response).returns(stub_response)
+
+    HTTPI.stubs(:post).with do |request, _|
+      assert_includes request.body, "xmlns:ns1=\"soap:enterprise:namespace\""
+      xml_doc = Nokogiri::XML(request.body)
+      assert_equal 'soap_body', xml_doc.xpath('//wsdl:notLogin/text()').to_s
+      assert_equal 'boyahh_session_id', xml_doc.xpath('//env:Header/ns1:SessionHeader/ns1:sessionId/text()').to_s
+      assert_equal '"notLogin"', request.headers['SOAPAction']
+      assert_equal Salesforce::Config.login_url, request.url.to_s
+    end.returns(stub_response)
 
     Salesforce::Config.stubs(:session_id).returns('boyahh_session_id')
     Salesforce::Config.stubs(:soap_enterprise_namespace).returns('soap:enterprise:namespace')
-
-    soap_mock = mock
-    soap_mock.expects(:body=).with(:soap_body)
-    soap_mock.expects(:header=).with({ "ns1:SessionHeader" => { "ns1:sessionId" => 'boyahh_session_id' }})
-    
-    
-    namespaces_mock = mock
-    namespaces_mock.expects(:[]=).with("xmlns:ns1", 'soap:enterprise:namespace')
-    soap_mock.expects(:namespaces).returns(namespaces_mock)
-    
-    soap_client_mock.expects(:request).with(:wsdl, :notLogin).yields(soap_mock).returns(mock(:to_hash => result))
     
     assert_raises Salesforce::Connection::SoapApi::Error do
       Salesforce.connection.send(:invoke_soap, :notLogin, options)
@@ -110,6 +114,7 @@ class Salesforce::Connection::SoapApiTest < ActiveSupport::TestCase
 
   def test_invoke_soap__login
     options = {
+      :endpoint_url => Salesforce::Config.login_url,
       :body => :soap_body,
       :other_option => 'foo'
     }
@@ -123,13 +128,21 @@ class Salesforce::Connection::SoapApiTest < ActiveSupport::TestCase
     }
     
     expected_result = result[:login_response][:result]
-    
-    soap_client_mock = mock
-    Salesforce.connection.expects(:soap_client).with(options).returns(soap_client_mock)
 
-    soap_mock = mock
-    soap_mock.expects(:body=).with(:soap_body)
-    soap_client_mock.expects(:request).with(:wsdl, :login).yields(soap_mock).returns(mock(:to_hash => result))
+    stub_response = stub(:http => stub(:code => 200, :headers => {}, :cookies => []), :body => result)
+    stub_response.stubs(:kind_of?).returns(true)
+
+    Savon::Operation.any_instance.stubs(:create_response).returns(stub_response)
+
+    HTTPI.stubs(:post).with do |request, _|
+      xml_doc = Nokogiri::XML(request.body)
+      assert_equal 'soap_body', xml_doc.xpath('//wsdl:login/text()').to_s
+      assert_equal '"login"', request.headers['SOAPAction']
+      assert_equal Salesforce::Config.login_url, request.url.to_s
+    end.returns(stub_response)
+
+    Salesforce::Config.stubs(:session_id).returns('boyahh_session_id')
+    Salesforce::Config.stubs(:soap_enterprise_namespace).returns('soap:enterprise:namespace')
     
     assert_equal expected_result, Salesforce.connection.send(:invoke_soap, :login, options)
   end
@@ -137,12 +150,12 @@ class Salesforce::Connection::SoapApiTest < ActiveSupport::TestCase
   def test_soap_client
     options = {
       :namespace => 'my:name:space',
-      :endpoint_url => 'https://my.endpoint.url.com'
+      :endpoint => 'https://my.endpoint.url.com'
     }
     
     client = Salesforce.connection.send(:soap_client, options)
-    assert_equal 'https://my.endpoint.url.com', client.wsdl.endpoint
-    assert_equal 'my:name:space', client.wsdl.namespace
+    assert_equal 'https://my.endpoint.url.com', client.globals[:endpoint]
+    assert_equal 'my:name:space', client.globals[:namespace]
   end
 
-end
+end

data/test/salesforce/connection_test.rb

@@ -5,20 +5,20 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
     Salesforce.connection.expects(:get).with("query.json?q=SELECT+Id+FROM+Account", :format => :json).returns({ "records" => [{ :record => 1, "attributes" => 'foo'}], "done" => true, "totalSize" => 1999})
     assert_equal [{ :record => 1 }], Salesforce.connection.soql("SELECT Id FROM Account")
   end
-
+  
   def test_query__more_than_2000_records
-    Salesforce.connection.expects(:get).with("query.json?q=SELECT+Id+FROM+Account", :format => :json).returns({
+    Salesforce.connection.expects(:get).with("query.json?q=SELECT+Id+FROM+Account", :format => :json).returns({ 
       "records" => [ { :record => 1, "attributes" => "foo" } ], "done" => false, "totalSize" => 4999, "nextRecordsUrl" =>"/services/data/v22.0/query/01g8000000L9FSmAAN-2000"})
-
-    Salesforce.connection.expects(:get).with("/services/data/v22.0/query/01g8000000L9FSmAAN-2000.json", :format => :json).returns({
+      
+    Salesforce.connection.expects(:get).with("/services/data/v22.0/query/01g8000000L9FSmAAN-2000.json", :format => :json).returns({ 
       "records" => [ { :record => 2, "attributes" => "foo" } ], "done" => false, "totalSize" => 4999, "nextRecordsUrl" =>"/services/data/v22.0/query/01g8000000L9FSmAAN-4000"})
 
-    Salesforce.connection.expects(:get).with("/services/data/v22.0/query/01g8000000L9FSmAAN-4000.json", :format => :json).returns({
+    Salesforce.connection.expects(:get).with("/services/data/v22.0/query/01g8000000L9FSmAAN-4000.json", :format => :json).returns({ 
       "records" => [ { :record => 3, "attributes" => "foo" } ], "done" => true, "totalSize" => 4999})
-
+    
     assert_equal [{ :record => 1}, { :record => 2}, { :record => 3}], Salesforce.connection.soql("SELECT Id FROM Account")
   end
-
+  
   def test_as_logged_in_user__login_succeeded__calls_block
     Salesforce::Authentication.expects(:session_id)
     results = Salesforce.connection.as_logged_in_user do
@@ -26,12 +26,12 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
     end
     assert_equal :results, results
   end
-
+  
   def test_as_logged_in_user__logged_out__recovers
     flag = nil
     Salesforce::Authentication.expects(:session_id).twice
     Salesforce::Authentication.expects(:logout)
-    error = RestClient::Unauthorized.new
+    error = RestClient::Request::Unauthorized.new
     results = Salesforce.connection.as_logged_in_user do
       unless flag
         flag = true
@@ -41,32 +41,32 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
     end
     assert_equal :results, results
   end
-
+  
   def test_as_logged_in_user__authorization_failure
     flag = nil
     Salesforce::Authentication.expects(:session_id).times(2)
     Salesforce::Authentication.expects(:logout)
-    error = RestClient::Unauthorized.new
-    assert_raises RestClient::Unauthorized do
+    error = RestClient::Request::Unauthorized.new
+    assert_raises RestClient::Request::Unauthorized do
       Salesforce.connection.as_logged_in_user do
         raise error
       end
     end
   end
-
+  
   def test_as_logged_in_user__invalid_username_password__recovers
     on_login_failure_called = false
 
-    Salesforce.configure do
+    Salesforce.configure do 
       on_login_failure { on_login_failure_called = true }
     end
-
+    
     xml = <<-XML
     <?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><soapenv:Fault xmlns:fns="http://fault.api.zuora.com/"><faultcode>sf:INVALID_LOGIN</faultcode><faultstring>INVALID_LOGIN: Invalid username, password, security token; or user locked out.</faultstring><detail><fns:LoginFault><fns:FaultCode>INVALID_LOGIN</fns:FaultCode><fns:FaultMessage>Invalid username, password, security token; or user locked out.</fns:FaultMessage></fns:LoginFault></detail></soapenv:Fault></soapenv:Body></soapenv:Envelope>
     XML
 
-    error = Savon::SOAP::Fault.new(stub(:body => xml))
-
+    error = Savon::SOAPFault.new(stub(:body => xml), Nori.new,  xml)
+    
     flag = nil
     Salesforce::Authentication.expects(:session_id).twice
     Salesforce::Authentication.expects(:logout)
@@ -77,29 +77,29 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
       end
       :results
     end
-
+    
     assert_equal :results, results
     assert on_login_failure_called, "Salesforce::Config.on_login_failure was not called upon login failure"
   end
-
+  
   def test_as_logged_in_user__invalid_username_password__doesnt_recover
     on_login_failure_called = 0
 
-    Salesforce.configure do
+    Salesforce.configure do 
       on_login_failure { on_login_failure_called += 1 }
     end
-
+    
     xml = <<-XML
     <?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><soapenv:Fault xmlns:fns="http://fault.api.zuora.com/"><faultcode>sf:INVALID_LOGIN</faultcode><faultstring>INVALID_LOGIN: Invalid username, password, security token; or user locked out.</faultstring><detail><fns:LoginFault><fns:FaultCode>INVALID_LOGIN</fns:FaultCode><fns:FaultMessage>Invalid username, password, security token; or user locked out.</fns:FaultMessage></fns:LoginFault></detail></soapenv:Fault></soapenv:Body></soapenv:Envelope>
     XML
 
-    error = Savon::SOAP::Fault.new(stub(:body => xml))
-
+    error = Savon::SOAPFault.new(stub(:body => xml), Nori.new, xml)
+    
     flag = nil
     Salesforce::Authentication.expects(:session_id).twice
     Salesforce::Authentication.expects(:logout)
-
-    assert_raises Savon::SOAP::Fault do
+    
+    assert_raises Savon::SOAPFault do
       Salesforce.connection.as_logged_in_user do
         raise error
       end
@@ -107,14 +107,14 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
 
     assert_equal 1, on_login_failure_called, "Salesforce::Config.on_login_failure was not called upon login failure"
   end
-
+  
   def test_as_logged_in_user__invalid_username_password__recovers__no_on_login_failure_hook
     xml = <<-XML
     <?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><soapenv:Fault xmlns:fns="http://fault.api.zuora.com/"><faultcode>sf:INVALID_LOGIN</faultcode><faultstring>INVALID_LOGIN: Invalid username, password, security token; or user locked out.</faultstring><detail><fns:LoginFault><fns:FaultCode>INVALID_LOGIN</fns:FaultCode><fns:FaultMessage>Invalid username, password, security token; or user locked out.</fns:FaultMessage></fns:LoginFault></detail></soapenv:Fault></soapenv:Body></soapenv:Envelope>
     XML
 
-    error = Savon::SOAP::Fault.new(stub(:body => xml))
-
+    error = Savon::SOAPFault.new(stub(:body => xml), Nori.new, xml)
+    
     flag = nil
     Salesforce::Authentication.expects(:session_id).twice
     Salesforce::Authentication.expects(:logout)
@@ -125,15 +125,15 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
       end
       :results
     end
-
+    
     assert_equal :results, results
   end
-
+  
   def test_as_logged_in_user__other_failure
     Salesforce::Authentication.stubs(:session_id)
     Salesforce::Authentication.stubs(:logout)
 
-    expects(:my_method).twice.raises(RestClient::Unauthorized.new).then.raises(StandardError.new("some other error"))
+    expects(:my_method).twice.raises(RestClient::Request::Unauthorized.new).then.raises(StandardError.new("some other error"))
 
     assert_raises StandardError do
       Salesforce.connection.as_logged_in_user do
@@ -141,14 +141,8 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
       end
     end
   end
-
+  
   def test_convert
     assert_equal "str", Salesforce.connection.convert("str", {})
   end
-
-  private
-
-  def my_method
-    # Defined so it can be stubbed in a test
-  end
 end

data/test/test_helper.rb

@@ -15,14 +15,14 @@ require 'activeforce'
 Dir.glob(File.expand_path('../../app/models/salesforce/**.rb', __FILE__)).each { |file| require(file) }
 
 require 'mocha/setup'
-Mocha::Configuration.prevent(:stubbing_non_existent_method)
+
 
 Time.zone = 'America/Los_Angeles'
 
 class ActiveSupport::TestCase
   setup :clean_configuration
   setup :stub_soap
-
+  
   class ::Salesforce::BulkTable < Salesforce::Base
     self.custom_object = true
   end
@@ -30,50 +30,50 @@ class ActiveSupport::TestCase
   def clean_configuration
     Salesforce::Config.instance_variable_set(:@instance, nil)
   end
-
+  
   def stub_soap
-    Mocha::Configuration.allow(:stubbing_non_existent_method) do
-      Savon::Client.any_instance.stubs(:request)
-    end
+    Savon::Client.any_instance.stubs(:request)
   end
-
+  
   def clear_columns_for_bulk_table
     Salesforce::BulkTable.cached_columns   = nil
   end
-
+  
   def clear_columns_for_account
     Salesforce::Account.cached_columns   = nil
   end
-
+  
   def setup_columns_for_bulk_table
     clear_columns_for_bulk_table
-    columns_hash = [
-      { "name" => "Id", "type" => "id", "createable" => false, "updateable" => false},
-      { "name" => "Account__c", "type" => "reference", "createable" => true, "updateable" => false, "custom" => true },
+    columns_hash = [ 
+      { "name" => "Id", "type" => "id", "createable" => false, "updateable" => false}, 
+      { "name" => "Account__c", "type" => "reference", "createable" => true, "updateable" => false, "custom" => true }, 
       { "name" => "Car__c", "type" => "reference", "createable" => false, "updateable" => true, "custom" => true},
       { "name" => "Name__c", "type" => "string", "createable" => true, "updateable" => true, "custom" => true},
-      { "name" => "dob__c", "type" => "date", "createable" => true, "updateable" => true, "custom" => true}
+      { "name" => "dob__c", "type" => "date", "createable" => true, "updateable" => true, "custom" => true} 
     ]
-
+    
     Salesforce.connection.stubs(:fields).with("BulkTable__c").returns(columns_hash).twice
     columns      = Salesforce::Columns.new("BulkTable__c")
     assert_equal columns, Salesforce::BulkTable.columns
   end
-
+  
   def setup_columns_for_account
     clear_columns_for_account
-    columns_hash = [
-      { "name" => "Id", "type" => "id", "createable" => false, "updateable" => false},
-      { "name" => "Name", "type" => "string", "createable" => true, "updateable" => true},
-      { "name" => "Type", "type" => "string", "createable" => true, "updateable" => true},
-      { "name" => "Address", "type" => "string", "createable" => true, "updateable" => true},
-      { "name" => "City", "type" => "string", "createable" => true, "updateable" => true},
+    columns_hash = [ 
+      { "name" => "Id", "type" => "id", "createable" => false, "updateable" => false}, 
+      { "name" => "Name", "type" => "string", "createable" => true, "updateable" => true}, 
+      { "name" => "Type", "type" => "string", "createable" => true, "updateable" => true}, 
+      { "name" => "Address", "type" => "string", "createable" => true, "updateable" => true}, 
+      { "name" => "City", "type" => "string", "createable" => true, "updateable" => true}, 
       { "name" => "State", "type" => "string", "createable" => true, "updateable" => true},
       { "name" => "Number", "type" => "string", "createable" => true, "updateable" => false}
     ]
-
+    
     Salesforce.connection.stubs(:fields).with("Account").returns(columns_hash).twice
     columns      = Salesforce::Columns.new("Account")
     assert_equal columns, Salesforce::Account.columns
   end
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeforce
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Tushar Ranka
@@ -17,34 +17,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: blockenspiel
   requirement: !ruby/object:Gem::Requirement
@@ -63,14 +63,20 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -90,6 +96,7 @@ dependencies:
 description: " Activeforce provides a simple to use and extend interface to Salesforce
   using the REST API"
 email:
+- tusharranka@gmail.com
 - andrew.mutz@appfolio.com
 executables: []
 extensions: []
@@ -152,9 +159,9 @@ files:
 - app/models/salesforce/user.rb
 - app/models/salesforce/user_role.rb
 - app/models/salesforce/vote.rb
-- gemfiles/5.0.gemfile
-- gemfiles/5.2.gemfile
-- gemfiles/6.0.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/activeforce.rb
 - lib/activeforce/version.rb
 - lib/ruby_187_range_extension.rb
@@ -202,14 +209,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Simple gem to interact with the Salesforce REST API