From 0e355b7be9c3031f5d04d893883a24472b6d155c Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 25 Oct 2016 10:56:05 +0100
Subject: [PATCH] Adding config and Gemfile update for moduleSync

---
 .travis.yml | 2 ++
 Gemfile     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4e549bf77..0e0d36348 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake validate lint spec"
+before_install:
+  - gem update bundler
 matrix:
   fast_finish: true
   include:
diff --git a/Gemfile b/Gemfile
index c97275bd8..5457e5c65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,8 +23,10 @@ group :development, :unit_tests do
   gem 'puppetlabs_spec_helper', '>= 1.2.1'
   gem 'rspec-puppet', '>= 2.3.2'
   gem 'rspec-puppet-facts'
+  gem 'mocha', '< 1.2.0'
   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'