msync

.travis.yml

@@ -1,18 +1,17 @@
 language: ruby
-dist: precise
 sudo: required
 rvm:
-  # Ruby with Puppet 5
   - 2.4.4
 notifications:
   email:
    - raphael.pinson@camptocamp.com
 env:
 # base env
-  # Test latest Puppet 5
-  - PUPPET=5.0 RUBY_AUGEAS=0.5 FORGE_PUBLISH=true
-  # Test latest Puppet
-  - PUPPET=6.0 RUBY_AUGEAS=0.5
+  # Test latest Puppet 5 version
+  - PUPPET=5.5 RUBY_AUGEAS=0.5 FORGE_PUBLISH=true
+  # Test latest Puppet version
+  - PUPPET=6 RUBY_AUGEAS=0.5
+
 
 matrix:
   fast_finish: true

spec/spec_helper.rb

@@ -23,22 +23,5 @@
 
 Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules')
 
-# There's no real need to make this version dependent, but it helps find
-# regressions in Puppet
-#
-# 1. Workaround for issue #16277 where default settings aren't initialised from
-# a spec and so the libdir is never initialised (3.0.x)
-# 2. Workaround for 2.7.20 that now only loads types for the current node
-# environment (#13858) so Puppet[:modulepath] seems to get ignored
-# 3. Workaround for 3.5 where context hasn't been configured yet,
-# ticket https://tickets.puppetlabs.com/browse/MODULES-823
-#
-ver = Gem::Version.new(Puppet.version.split('-').first)
-if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver || Gem::Requirement.new("~> 4.0") =~ ver || Gem::Requirement.new("~> 5.0") =~ ver
-  puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading"
-  # libdir is only a single dir, so it can only workaround loading of one external module
-  Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib"
-end
-
 # Load all shared contexts and shared examples
 Dir["#{dir}/support/**/*.rb"].sort.each {|f| require f}