Update to require using stdlib 4.13 for deprecation function

diff --git a/.fixtures.yml b/.fixtures.yml
index 578437cb9f0074e35ffb8b504f5f6c600d8c4b23..0c221f0da7306aa9c8f020cfcd70fc146e5f175f 100644 (file)
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -2,6 +2,5 @@ fixtures:
   repositories:
     "stdlib":
       "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
   repositories:
     "stdlib":
       "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git"

-      "ref": "4.5.0"

   symlinks:
     "apt": "#{source_dir}"
   symlinks:
     "apt": "#{source_dir}"

diff --git a/.sync.yml b/.sync.yml
index bf2a8818d404a26265f23d40f7260e3096ed34f1..1e54e2104c2c49fceb210c93d55e3894ac48686a 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -4,3 +4,6 @@
   docker_sets:
   - set: docker/ubuntu-14.04
   - set: docker/debian-8
   docker_sets:
   - set: docker/ubuntu-14.04
   - set: docker/debian-8

+
+spec/spec_helper.rb:
+  allow_deprecations: true

diff --git a/metadata.json b/metadata.json
index d34221c752bedbd55829b1e0a5071381f3a038b9..1b21a5c193f04f7c33ed38ce39c991bc82b7fb92 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -8,7 +8,7 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
   "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [

-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.5.0 < 5.0.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.13.0 < 5.0.0"}

   ],
   "operatingsystem_support": [
     {
   ],
   "operatingsystem_support": [
     {

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index a326bdbdd3239c400319eb199b127ef88f5fe6a7..319074be2abb539f16daceeae86b7e37ac99f25c 100644 (file)
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -95,9 +95,7 @@ describe 'apt::setting' do
 
     context 'with priority=1.2' do
       let(:params) { default_params.merge({ :priority => 1.2 }) }
 
     context 'with priority=1.2' do
       let(:params) { default_params.merge({ :priority => 1.2 }) }

-      it do
-        expect { subject.call }.to raise_error(Puppet::Error, /be an integer /)
-      end
+      it { is_expected.to compile.and_raise_error(/input needs to be a String/) }

     end
   end
 
     end
   end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9ae37b172941cfc5d206f6168c4dbab7748f48d7..22d5d689f4616681ae30d187d834009cebf008e3 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,14 +1,6 @@
 #This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
 
 #This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
 

-if Puppet.version.to_f >= 4.5
-  RSpec.configure do |c|
-    c.before :each do
-      Puppet.settings[:strict] = :error
-    end
-  end
-end
-

 # put local configuration and setup into spec_helper_local
 begin
   require 'spec_helper_local'
 # put local configuration and setup into spec_helper_local
 begin
   require 'spec_helper_local'

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index a5ce06fc45815156e2d32c61377f97d04de21701..3f87bd13da68829c6b1e4d1f794a1f5962c38873 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -44,7 +44,7 @@ RSpec.configure do |c|
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'apt')
       shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'apt')
       shell("/bin/touch #{default['puppetpath']}/hiera.yaml")

-      on host, puppet('module install puppetlabs-stdlib --version 4.5.0'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module install puppetlabs-stdlib --version 4.13.1')

     end
   end
 end
     end
   end
 end