From 6db149450c31487dd41b7cd04052aa7997a1f4cc Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <treydock@gmail.com>
Date: Sat, 27 Oct 2018 17:13:48 -0400
Subject: [PATCH] Support stdlib 5.x Move puppet6 specific fixtures into main
 fixtures

---
 .fixtures-puppet6.yml => .fixtures-latest.yml | 7 ++++---
 .fixtures.yml                                 | 4 ++++
 .travis.yml                                   | 6 +++++-
 Gemfile                                       | 2 +-
 metadata.json                                 | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)
 rename .fixtures-puppet6.yml => .fixtures-latest.yml (85%)

diff --git a/.fixtures-puppet6.yml b/.fixtures-latest.yml
similarity index 85%
rename from .fixtures-puppet6.yml
rename to .fixtures-latest.yml
index c871b8e018..9deabd9b85 100644
--- a/.fixtures-puppet6.yml
+++ b/.fixtures-latest.yml
@@ -2,18 +2,19 @@ fixtures:
   repositories:
     apt:
       repo: git://github.com/puppetlabs/puppetlabs-apt.git
-      ref: 4.1.0
+      ref: 6.1.1
     yumrepo_core:
       repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
       ref: 1.0.1
+      puppet_version: ">= 6.0.0"
     stdlib:
       repo: git://github.com/puppetlabs/puppetlabs-stdlib.git
-      ref: 4.24.0
+      ref: 5.1.0
     remote_file:
       repo: git://github.com/lwf/puppet-remote_file.git
       ref: v1.1.3
     powershell:
       repo: git://github.com/puppetlabs/puppetlabs-powershell.git
-      ref: 2.1.0
+      ref: 2.1.5
   symlinks:
     sensu: "#{source_dir}"
diff --git a/.fixtures.yml b/.fixtures.yml
index e4a1fdf671..231e565ea8 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -3,6 +3,10 @@ fixtures:
     apt:
       repo: git://github.com/puppetlabs/puppetlabs-apt.git
       ref: 4.1.0
+    yumrepo_core:
+      repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
+      ref: 1.0.1
+      puppet_version: ">= 6.0.0"
     stdlib:
       repo: git://github.com/puppetlabs/puppetlabs-stdlib.git
       ref: 4.24.0
diff --git a/.travis.yml b/.travis.yml
index 318a434d87..f7532bfdeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,12 @@ matrix:
   include:
   - rvm: 2.4.4
     env: PUPPET_GEM_VERSION="~> 5"
+  - rvm: 2.4.4
+    env: PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
+  - rvm: 2.5.1
+    env: PUPPET_GEM_VERSION="~> 6"
   - rvm: 2.5.1
-    env: PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-puppet6.yml"
+    env: PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
   - rvm: 2.4.4
     sudo: required
     services: docker
diff --git a/Gemfile b/Gemfile
index 00ae018727..cda8e3a0f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ group :development, :unit_tests do
   gem 'rake',                                             '< 11.0.0'
   gem 'rspec-puppet', '~> 2.6.0',                         :require => false
   gem 'rspec-mocks',                                      :require => false
-  gem 'puppetlabs_spec_helper', '>= 2.7.0',               :require => false
+  gem 'puppetlabs_spec_helper', '>= 2.11.0',               :require => false
   gem 'puppet-lint', "~> 2.0",                            :require => false
   gem 'json', "~> 1.8.3",                                 :require => false
   gem 'json_pure', "~> 1.8.3",                            :require => false
diff --git a/metadata.json b/metadata.json
index 437f5c950e..266bc867dc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -75,7 +75,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">=4.24.0 <5.0.0"
+      "version_requirement": ">=4.24.0 <6.0.0"
     }
   ]
 }