Merge pull request #64 from puppetlabs/msync_modules5187

(MODULES-5187) mysnc puppet 5 and ruby 2.4
puppetlabs · Jul 14, 2017 · cfe5f1b · cfe5f1b
2 parents 16a3f55 + d491489
commit cfe5f1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,10 +22,10 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.3.1
+  - rvm: 2.4.0
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.7
+    env: PUPPET_GEM_VERSION="~> 5.0"
+  - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:

diff --git a/spec/unit/puppet/type/hocon_setting_spec.rb b/spec/unit/puppet/type/hocon_setting_spec.rb
@@ -72,7 +72,7 @@
     ['string', 'text'].each do |t|
       resource[:type]  = t
       expect { resource[:value] = 4 }.to raise_error \
-        Puppet::Error, /Type specified as #{t} but was Fixnum/
+        Puppet::Error, /Type specified as #{t} but was (Fixnum|Integer)/
     end
   end
 
@@ -120,6 +120,6 @@
   it 'raises an error with invalid hash values' do
     resource[:type]  = 'hash'
     expect { resource[:value] = 4 }.to raise_error \
-      Puppet::Error, /Type specified as 'hash' but was Fixnum/
+      Puppet::Error, /Type specified as 'hash' but was (Fixnum|Integer)/
   end
 end