From 0a6df1389b58ac787f3339a7f6ac3d1cdf56b9b9 Mon Sep 17 00:00:00 2001
From: lnemsick-simp <lnemsick-simp@users.noreply.github.com>
Date: Wed, 8 Mar 2017 18:29:37 -0500
Subject: [PATCH] (SIMP-2814) Fix Gemfile to fix tests (#2)

- Fix Gemfile
- Fix malformed travis.yaml

SIMP-2814 #close
SIMP-2747 #comment
---
 .travis.yml |  4 ++--
 Gemfile     | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecebd43..ed54b79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@
 # S6.0.0  4.7  2.1.9
 ---
 language: ruby
-sudo: true
+sudo: false
 cache: bundler
 before_script:
   - bundle
@@ -37,4 +37,4 @@ matrix:
     - env: PUPPET_VERSION="~> 3.8.0"
     - env: PUPPET_VERSION="~> 4.4.0"
     - env: PUPPET_VERSION="~> 4.3.0"
-- env: PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes
+    - env: PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes
diff --git a/Gemfile b/Gemfile
index 4a7a6a2..894b539 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,26 +6,28 @@ gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[,
 gem_sources.each { |gem_source| source gem_source }
 
 group :test do
-  gem "rake"
+  gem 'rake'
   gem 'puppet', ENV.fetch('PUPPET_VERSION',  '~>4')
-  gem "rspec", '< 3.2.0'
-  gem "rspec-puppet"
-  gem "hiera-puppet-helper"
-  gem "puppetlabs_spec_helper"
-  gem "metadata-json-lint"
-  gem "simp-rspec-puppet-facts", ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 1.3')
-  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 3')
+  gem 'rspec'
+  gem 'rspec-puppet'
+  gem 'puppet-strings'
+  gem 'hiera-puppet-helper'
+  gem 'puppetlabs_spec_helper'
+  gem 'metadata-json-lint'
+  gem 'puppet-lint-empty_string-check',   :require => false
+  gem 'puppet-lint-trailing_comma-check', :require => false
+  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 1.3')
+  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 3.0')
 end
 
 group :development do
-  gem "travis"
-  gem "travis-lint"
-  gem "travish"
-  gem "puppet-blacksmith"
-  gem "guard-rake"
+  gem 'travis'
+  gem 'travis-lint'
+  gem 'travish'
+  gem 'puppet-blacksmith'
+  gem 'guard-rake'
   gem 'pry'
   gem 'pry-doc'
-  gem 'puppet-strings'
 
   # `listen` is a dependency of `guard`
   # from `listen` 3.1+, `ruby_dep` requires Ruby version >= 2.2.3, ~> 2.2
@@ -33,7 +35,8 @@ group :development do
 end
 
 group :system_tests do
-  gem 'beaker', :git => 'https://github.com/trevor-vaughan/beaker', :ref => 'BKR-931-2.51.0'
+  # This patch is required to fix Beaker's broken `aio` handling
+  gem 'beaker', :git => 'https://github.com/trevor-vaughan/beaker.git', :branch => 'BKR-978-2.51.0'
   gem 'beaker-rspec'
   gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.5')
 end