Added new versions of partner and metadata WSDL files (version 56.0).…

… Also, fixes a number of unit test failures caused by upgrades of Ruby, rspec, rubyzip, etc. Still some test failures (9 out of 85 fail) that need more investigation to resolve.

.gitignore

@@ -7,3 +7,6 @@ deploy.zip
 retrieve.zip
 test.rb
 .metaforce.yml
+Vagrantfile
+.vagrant
+.idea

lib/metaforce.rb

@@ -1,5 +1,6 @@
 require 'savon'
 require 'hashie'
+require 'active_support'
 require 'active_support/core_ext'
 
 require 'metaforce/version'

lib/metaforce/config.rb

@@ -57,7 +57,7 @@ def initialize
     end
 
     def api_version
-      @api_version ||= '26.0'
+      @api_version ||= '56.0'
     end
 
     def host

lib/metaforce/manifest.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'active_support'
 require 'active_support/core_ext'
 
 module Metaforce

metaforce.gemspec

@@ -22,15 +22,16 @@ EOL
   s.require_paths = ['lib']
 
   s.add_dependency 'savon', '~> 1.2.0'
-  s.add_dependency 'rubyzip'
+  s.add_dependency 'rubyzip', '~> 2.3.2'
   s.add_dependency 'activesupport'
-  s.add_dependency 'hashie'
-  s.add_dependency 'thor'
-  s.add_dependency 'listen'
-  s.add_dependency 'rb-fsevent'
+  s.add_dependency 'hashie', '~> 5.0.0'
+  s.add_dependency 'thor', '~> 1.2.1'
+  s.add_dependency 'listen', '~> 3.7.1'
+  s.add_dependency 'rb-fsevent', '~> 0.11.2'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'savon_spec'
 end

spec/fixtures/package.xml

@@ -13,5 +13,5 @@
     <members>Assets</members>
     <name>StaticResource</name>
   </types>
-  <version>26.0</version>
+  <version>56.0</version>
 </Package>

spec/lib/config_spec.rb

@@ -3,10 +3,10 @@
 describe Metaforce do
   describe '.configuration' do
     subject { Metaforce.configuration }
-    it { should set_default(:api_version).to('26.0') }
+    it { should set_default(:api_version).to('56.0') }
     it { should set_default(:host).to('login.salesforce.com') }
-    it { should set_default(:endpoint).to('https://login.salesforce.com/services/Soap/u/26.0') }
-    it { should set_default(:partner_wsdl).to(File.expand_path('../../../wsdl/26.0/partner.xml', __FILE__)) }
-    it { should set_default(:metadata_wsdl).to(File.expand_path('../../../wsdl/26.0/metadata.xml', __FILE__)) }
+    it { should set_default(:endpoint).to('https://login.salesforce.com/services/Soap/u/56.0') }
+    it { should set_default(:partner_wsdl).to(File.expand_path('../../../wsdl/56.0/partner.xml', __FILE__)) }
+    it { should set_default(:metadata_wsdl).to(File.expand_path('../../../wsdl/56.0/metadata.xml', __FILE__)) }
   end
 end

spec/lib/job/deploy_spec.rb

@@ -11,7 +11,7 @@
     context 'when the path is a file' do
       before do
         client.should_receive(:_deploy).with(/^UEsDBA.*/, {}).and_return(Hashie::Mash.new(id: '1234'))
-        client.should_receive(:status).any_number_of_times.and_return(Hashie::Mash.new(done: true, state: 'Completed'))
+        client.should_receive(:status).at_least(1).times.and_return(Hashie::Mash.new(done: true, state: 'Completed'))
       end
 
       it { should eq job }
@@ -21,7 +21,7 @@
     context 'when the path is a directory' do
       before do
         client.should_receive(:_deploy).with(/.*1stwAAAJI.*/, {}).and_return(Hashie::Mash.new(id: '1234'))
-        client.should_receive(:status).any_number_of_times.and_return(Hashie::Mash.new(done: true, state: 'Completed'))
+        client.should_receive(:status).at_least(1).times.and_return(Hashie::Mash.new(done: true, state: 'Completed'))
       end
 
       let(:path) { File.expand_path('../../../fixtures', __FILE__) }
@@ -49,6 +49,6 @@
     end
 
     subject { job.success? }
-    it { should be_true }
+    it { should be true }
   end
 end

spec/lib/job/retrieve_spec.rb

@@ -23,6 +23,6 @@
     end
 
     subject { job.zip_file.bytes }
-    it { should eq [126, 138, 27] }
+    it { should eq [126, 138, 27, 106] }
   end
 end

spec/lib/job_spec.rb

@@ -19,33 +19,33 @@
         job.instance_variable_set(:@id, '1234')
       end
 
-      it { should be_true }
+      it { should be true }
     end
 
     context 'when .perform has not been called and no @id has been set' do
-      it { should be_false }
+      it { should be false }
     end
   end
 
   describe '.on_complete' do
     it 'allows the user to register an on_complete callback' do
-      client.should_receive(:status).any_number_of_times.and_return(Hashie::Mash.new(done: true, state: 'Completed'))
+      client.should_receive(:status).at_least(1).times.and_return(Hashie::Mash.new(done: true, state: 'Completed'))
       called = false
       block = lambda { |job| called = true }
       job.on_complete &block
       job.perform
-      expect(called).to be_true
+      expect(called).to be true
     end
   end
 
   describe '.on_error' do
     it 'allows the user to register an on_error callback' do
-      client.should_receive(:status).any_number_of_times.and_return(Hashie::Mash.new(done: true, state: 'Error'))
+      client.should_receive(:status).at_least(1).times.and_return(Hashie::Mash.new(done: true, state: 'Error'))
       called = false
       block = lambda { |job| called = true }
       job.on_error &block
       job.perform
-      expect(called).to be_true
+      expect(called).to be true
     end
   end
 
@@ -66,15 +66,15 @@
         client.should_receive(:status).and_return(Hashie::Mash.new(done: true))
       end
 
-      it { should be_true }
+      it { should be true }
     end
 
     context 'when not done' do
       before do
         client.should_receive(:status).and_return(Hashie::Mash.new(done: false))
       end
 
-      it { should be_false }
+      it { should be false }
     end
   end
 
@@ -94,7 +94,7 @@
         client.should_receive(:status).once.and_return(Hashie::Mash.new(done: false))
       end
 
-      it { should be_false }
+      it { should be nil }
     end
   end
 
@@ -105,7 +105,7 @@
       end
 
       subject { job.send(:"#{state.underscore}?") }
-      it { should be_true }
+      it { should be true }
     end
   end
 end

spec/lib/reporters/base_reporter_spec.rb

@@ -55,25 +55,25 @@
     subject { reporter.problems? }
 
     context 'when there are no problems' do
-      it { should be_false }
+      it { should be false }
     end
 
     context 'when there are problems' do
       let(:results) { Hashie::Mash.new(success: true, messages: { problem: 'Problem', file_name: 'path/file', line_number: '10' }) }
-      it { should be_true }
+      it { should be true }
     end
   end
 
   describe '.issues?' do
     subject { reporter.issues? }
 
     context 'when there are no problems' do
-      it { should be_false }
+      it { should be false }
     end
 
     context 'when there are problems' do
       let(:results) { Hashie::Mash.new(success: true, messages: { problem: 'Problem', file_name: 'path/file', line_number: '10' }) }
-      it { should be_true }
+      it { should be true }
     end
   end
 end

spec/lib/reporters/deploy_reporter_spec.rb

@@ -11,7 +11,6 @@
     it 'prints the failure' do
       reporter.should_receive(:say).with('  stack trace:', :red)
       reporter.should_receive(:say).with('     message')
-      reporter.should_receive(:say).with
       reporter.failed(failure)
     end
   end
@@ -113,12 +112,12 @@
 
     context 'when there are failures' do
       let(:num_failures) { '5' }
-      it { should be_true }
+      it { should be true }
     end
 
     context 'when there are no failures' do
       let(:num_failures) { '0' }
-      it { should be_false }
+      it { should be false }
     end
   end
 end

spec/spec_helper.rb

@@ -35,3 +35,11 @@
 end
 
 Savon::Spec::Fixture.path = File.join(File.dirname(__FILE__), 'fixtures/requests')
+
+# Monkey patch the old URI.escape method that was removed in Ruby 3.
+# It is called by the old version of wasabi that is required to metaforce.
+module URI
+  def URI.escape(url)
+    CGI.escape(url)
+  end
+end