From 5f7b5ab433f72923771efd5245aa9e12dcb12bc3 Mon Sep 17 00:00:00 2001
From: Eric Cook <ecook@nexcess.net>
Date: Fri, 7 Oct 2016 21:42:44 -0400
Subject: [PATCH] remove ruby < 2.0 testing

---
 .travis.yml                              | 4 ----
 Gemfile                                  | 2 +-
 spec/classes/params_spec.rb              | 2 ++
 spec/classes/udev_spec.rb                | 1 +
 spec/classes/udevadm/logpriority_spec.rb | 2 ++
 spec/classes/udevadm/trigger_spec.rb     | 2 ++
 spec/defines/rule_spec.rb                | 1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb443a8..81e9a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,6 @@ sudo: false
 language: ruby
 bundler_args: --without beaker
 rvm:
-  - 1.8.7
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
@@ -12,8 +10,6 @@ env:
   - PUPPET_GEM_VERSION="~> 4.0"
 matrix:
   exclude:
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 4.0"
     - rvm: 2.2
       env: PUPPET_GEM_VERSION="~> 3.7"
   fast_finish: true
diff --git a/Gemfile b/Gemfile
index c920b1b..8576981 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ end
 
 group :beaker do
   gem 'serverspec',               :require => false
-  gem 'beaker',                   :require => false
+  gem 'beaker', '<= 2.26.0',      :require => false
   gem 'beaker-rspec',             :require => false
   gem 'pry',                      :require => false
   gem 'travis-lint',              :require => false
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 4b9f0cb..bc3f373 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -6,6 +6,7 @@
       {
         :osfamily                  => 'RedHat',
         :operatingsystemmajrelease => '6',
+        :operatingsystem           => 'RedHat',
       }
     end
 
@@ -18,6 +19,7 @@
       {
         :osfamily                  => 'RedHat',
         :operatingsystemmajrelease => '4',
+        :operatingsystem           => 'RedHat',
       }
     end
 
diff --git a/spec/classes/udev_spec.rb b/spec/classes/udev_spec.rb
index 86d8f39..1ad7ce6 100644
--- a/spec/classes/udev_spec.rb
+++ b/spec/classes/udev_spec.rb
@@ -28,6 +28,7 @@
       {
         :osfamily                  => 'RedHat',
         :operatingsystemmajrelease => '6',
+        :operatingsystem           => 'RedHat',
       }
     end
 
diff --git a/spec/classes/udevadm/logpriority_spec.rb b/spec/classes/udevadm/logpriority_spec.rb
index d81ac9e..3227cf1 100644
--- a/spec/classes/udevadm/logpriority_spec.rb
+++ b/spec/classes/udevadm/logpriority_spec.rb
@@ -32,6 +32,7 @@
     let(:facts) do
         { :osfamily                  => 'RedHat',
           :operatingsystemmajrelease => '6',
+          :operatingsystem           => 'RedHat',
         }
     end
 
@@ -67,6 +68,7 @@
     let(:facts) do
         { :osfamily                  => 'RedHat',
           :operatingsystemmajrelease => '5',
+          :operatingsystem           => 'RedHat',
         }
     end
 
diff --git a/spec/classes/udevadm/trigger_spec.rb b/spec/classes/udevadm/trigger_spec.rb
index 49bc2af..89308aa 100644
--- a/spec/classes/udevadm/trigger_spec.rb
+++ b/spec/classes/udevadm/trigger_spec.rb
@@ -6,6 +6,7 @@
     let(:facts) do
         { :osfamily                  => 'RedHat',
           :operatingsystemmajrelease => '6',
+          :operatingsystem           => 'RedHat',
         }
     end
 
@@ -22,6 +23,7 @@
     let(:facts) do
         { :osfamily                  => 'RedHat',
           :operatingsystemmajrelease => '5',
+          :operatingsystem           => 'RedHat',
         }
     end
 
diff --git a/spec/defines/rule_spec.rb b/spec/defines/rule_spec.rb
index fb77f9e..a3bd414 100644
--- a/spec/defines/rule_spec.rb
+++ b/spec/defines/rule_spec.rb
@@ -27,6 +27,7 @@
       {
         :osfamily                  => 'RedHat',
         :operatingsystemmajrelease => '6',
+        :operatingsystem           => 'RedHat',
       }
     end