From 1dc384e914aa3b176400f11d9e93e4f1ecb4d1cb Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Fri, 31 Aug 2018 13:09:22 +0200 Subject: [PATCH 1/3] Update webmock test dependency to 3.4.z This commit updates the webmock test dependency from 1.18.z to 3.4.z and corrects two tests that were broken by the change. This update picks up changes in webmock 2.3.1 that added support for Ruby 2.4. --- source/spec/vagrant-openstack-provider/client/glance_spec.rb | 2 +- source/spec/vagrant-openstack-provider/client/neutron_spec.rb | 2 +- source/vagrant-openstack-provider.gemspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/spec/vagrant-openstack-provider/client/glance_spec.rb b/source/spec/vagrant-openstack-provider/client/glance_spec.rb index 68eeea9..f19eff0 100644 --- a/source/spec/vagrant-openstack-provider/client/glance_spec.rb +++ b/source/spec/vagrant-openstack-provider/client/glance_spec.rb @@ -111,7 +111,7 @@ describe 'get_api_version_list' do it 'returns version list' do stub_request(:get, 'http://glance/') - .with(header: { 'Accept' => 'application/json' }) + .with(headers: { 'Accept' => 'application/json' }) .to_return( status: 200, body: '{ diff --git a/source/spec/vagrant-openstack-provider/client/neutron_spec.rb b/source/spec/vagrant-openstack-provider/client/neutron_spec.rb index 70047a9..1a49e07 100644 --- a/source/spec/vagrant-openstack-provider/client/neutron_spec.rb +++ b/source/spec/vagrant-openstack-provider/client/neutron_spec.rb @@ -138,7 +138,7 @@ context 'basic' do it 'returns version list' do stub_request(:get, 'http://neutron/') - .with(header: { 'Accept' => 'application/json' }) + .with(headers: { 'Accept' => 'application/json' }) .to_return( status: 200, body: '{ diff --git a/source/vagrant-openstack-provider.gemspec b/source/vagrant-openstack-provider.gemspec index 7515753..3af793d 100644 --- a/source/vagrant-openstack-provider.gemspec +++ b/source/vagrant-openstack-provider.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rspec', '~> 3.1.0' gem.add_development_dependency 'rspec-its', '~> 1.0.1' gem.add_development_dependency 'rspec-expectations', '~> 3.1.2' - gem.add_development_dependency 'webmock', '~> 1.18.0' + gem.add_development_dependency 'webmock', '~> 3.4.2' gem.add_development_dependency 'fakefs', '~> 0.5.2' gem.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR) From 38278b9237e7c61ba3d7b3ce881d63c60baa84ea Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Fri, 31 Aug 2018 13:14:25 +0200 Subject: [PATCH 2/3] Update Ruby versions in Travis matrix Vagrant 2.0 and 2.1 both ship with a bundled Ruby 2.4.4. This commit updates the Travis matrix to test those Vagrant versions with 2.4.4 instead of 2.2.5. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3743c03..2ed5596 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ matrix: include: - rvm: 2.2.5 env: VAGRANT_VERSION=v1.9.8 - - rvm: 2.2.5 + - rvm: 2.4.4 env: VAGRANT_VERSION=v2.0.4 - - rvm: 2.2.5 + - rvm: 2.4.4 env: VAGRANT_VERSION=v2.1.2 sudo: false From cad6afea2fa5d22bb2592953795c486803ba8658 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Mon, 10 Sep 2018 09:58:26 -0700 Subject: [PATCH 3/3] Update Vagrant 2.1.z tests to 2.1.4 This commit updates the Travis matrix to run tests against Vagrant 2.1.4. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ed5596..3d08fb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,6 @@ matrix: - rvm: 2.4.4 env: VAGRANT_VERSION=v2.0.4 - rvm: 2.4.4 - env: VAGRANT_VERSION=v2.1.2 + env: VAGRANT_VERSION=v2.1.4 sudo: false