From 832dbd4cb34a38709ff76f65f76aedb72130fb5f Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 20 Oct 2016 09:48:41 +0100
Subject: [PATCH] (MODULES-3983) Update parallel_tests for ruby 2.0.0

---
 .travis.yml         | 3 ---
 Gemfile             | 7 +++----
 spec/spec_helper.rb | 8 ++++++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf444710e..4e549bf77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,6 @@ matrix:
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
diff --git a/Gemfile b/Gemfile
index 0a7542d09..8222ef0a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,12 +21,11 @@ group :development, :unit_tests do
   gem 'puppet_facts'
   gem 'puppet-blacksmith', '>= 3.4.0'
   gem 'puppetlabs_spec_helper', '>= 1.2.1'
-  gem 'rspec-puppet', '>= 2.3.2', :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'fb27c533e2664057fba4b73d0bd902a946abfce0'
-  # the newly released mocha 1.2.0 causes hangs during spec testing. See MODULES-3958 for a long-term solution
-  gem 'mocha', '< 1.2.0'
+  gem 'rspec-puppet', '>= 2.3.2'
   gem 'rspec-puppet-facts'
   gem 'simplecov'
-  gem 'parallel_tests'
+  gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
+  gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
   gem 'rubocop' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 22d5d689f..9ae37b172 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,14 @@
 #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'