From cff25a8b60a49649f53a55c77426c7159801081a Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 9 Jan 2015 16:44:58 -0800
Subject: [PATCH] Fix pending tests

With rspec 3, pending() started inverting the logic so that if a
pending tests succeeds then it fails (so you can block on a future
change). These tests have no body so will always succeed.

Anyway, pending -> skip reverts the logic to the usual.
---
 spec/unit/classes/concat_setup_spec.rb    |  2 +-
 spec/unit/defines/concat_fragment_spec.rb | 10 +++++-----
 spec/unit/defines/concat_spec.rb          |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/unit/classes/concat_setup_spec.rb b/spec/unit/classes/concat_setup_spec.rb
index b25428ef5..325242439 100644
--- a/spec/unit/classes/concat_setup_spec.rb
+++ b/spec/unit/classes/concat_setup_spec.rb
@@ -43,7 +43,7 @@
 
   context 'deprecated as a public class' do
     it 'should create a warning' do
-      pending('rspec-puppet support for testing warning()')
+      skip('rspec-puppet support for testing warning()')
     end
   end
 
diff --git a/spec/unit/defines/concat_fragment_spec.rb b/spec/unit/defines/concat_fragment_spec.rb
index 64ae7dbdf..e6f6e0363 100644
--- a/spec/unit/defines/concat_fragment_spec.rb
+++ b/spec/unit/defines/concat_fragment_spec.rb
@@ -96,7 +96,7 @@
       let(:params) {{ :ensure => 'invalid', :target => '/etc/motd' }}
 
       it 'should create a warning' do
-        pending('rspec-puppet support for testing warning()')
+        skip('rspec-puppet support for testing warning()')
       end
     end
   end # ensure =>
@@ -244,7 +244,7 @@
         }
 
         it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
+          skip('rspec-puppet support for testing warning()')
         end
       end
     end # mode =>
@@ -257,7 +257,7 @@
         }
 
         it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
+          skip('rspec-puppet support for testing warning()')
         end
       end
     end # owner =>
@@ -270,7 +270,7 @@
         }
 
         it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
+          skip('rspec-puppet support for testing warning()')
         end
       end
     end # group =>
@@ -283,7 +283,7 @@
         }
 
         it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
+          skip('rspec-puppet support for testing warning()')
         end
       end
     end # backup =>
diff --git a/spec/unit/defines/concat_spec.rb b/spec/unit/defines/concat_spec.rb
index 7682cdf0b..2da833078 100644
--- a/spec/unit/defines/concat_spec.rb
+++ b/spec/unit/defines/concat_spec.rb
@@ -279,7 +279,7 @@
           it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
 
           it 'should create a warning' do
-            pending('rspec-puppet support for testing warning()')
+            skip('rspec-puppet support for testing warning()')
           end
         end
       end
@@ -386,7 +386,7 @@
         it_behaves_like 'concat', '/etc/foo.bar', { :gnu => 'foo'}
 
         it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
+          skip('rspec-puppet support for testing warning()')
         end
       end
     end