Fix failures from pending

6 files changed, 22 insertions, 22 deletions

diff --git a/spec/functional/resource/link_spec.rb b/spec/functional/resource/link_spec.rb
index 816f111c60..9416003660 100644
--- a/spec/functional/resource/link_spec.rb
+++ b/spec/functional/resource/link_spec.rb
@@ -348,7 +348,7 @@ describe Chef::Resource::Link do
           end
           it_behaves_like 'delete errors out'
         end
-        context 'and the link already exists and is not writeable to this user', :pending do
+        context 'and the link already exists and is not writeable to this user', :skip => true do
         end
         it_behaves_like 'a securable resource without existing target' do
           let(:path) { target_file }
@@ -416,7 +416,7 @@ describe Chef::Resource::Link do
           end
         end
       end
-      context "when the link destination is not readable to this user", :pending do
+      context "when the link destination is not readable to this user", :skip => true do
       end
       context "when the link destination does not exist" do
         include_context 'create symbolic link succeeds'
@@ -518,7 +518,7 @@ describe Chef::Resource::Link do
           end
           it_behaves_like 'delete errors out'
         end
-        context "and the link already exists and is not writeable to this user", :pending do
+        context "and the link already exists and is not writeable to this user", :skip => true do
         end
         context "and specifies security attributes" do
           before(:each) do
@@ -593,7 +593,7 @@ describe Chef::Resource::Link do
           end
         end
       end
-      context "when the link destination is not readable to this user", :pending do
+      context "when the link destination is not readable to this user", :skip => true do
       end
       context "when the link destination does not exist" do
         context 'and the link does not yet exist' do
diff --git a/spec/integration/knife/chef_fs_data_store_spec.rb b/spec/integration/knife/chef_fs_data_store_spec.rb
index d6300581f6..eb02db5384 100644
--- a/spec/integration/knife/chef_fs_data_store_spec.rb
+++ b/spec/integration/knife/chef_fs_data_store_spec.rb
@@ -180,7 +180,7 @@ EOM
         knife('list --local /users').should_succeed "/users/x.json\n"
       end
 
-      it 'After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty', :pending => (RUBY_VERSION < "1.9") do
+      it 'After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty', :skip => (RUBY_VERSION < "1.9") do
         knife("raw -z -i #{path_to('rolestuff.json')} -m PUT /roles/x").should_succeed( /"x"/ )
         expect(IO.read(path_to('roles/x.json'))).to eq <<EOM.strip
 {
@@ -246,7 +246,7 @@ EOM
         knife('list --local /users').should_succeed "/users/z.json\n"
       end
 
-      it 'After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty', :pending => (RUBY_VERSION < "1.9") do
+      it 'After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty', :skip => (RUBY_VERSION < "1.9") do
         knife("raw -z -i #{path_to('rolestuff.json')} -m POST /roles").should_succeed( /uri/ )
         expect(IO.read(path_to('roles/x.json'))).to eq <<EOM.strip
 {
diff --git a/spec/integration/knife/diff_spec.rb b/spec/integration/knife/diff_spec.rb
index c12ebbcf8f..465383437f 100644
--- a/spec/integration/knife/diff_spec.rb
+++ b/spec/integration/knife/diff_spec.rb
@@ -247,7 +247,7 @@ EOM
         end
         when_the_chef_server 'has an environment with a different value' do
           before { environment 'x', { 'description' => 'hi' } }
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x",
@@ -277,7 +277,7 @@ EOM
             environment 'x', {}
           end
 
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x"
@@ -291,7 +291,7 @@ EOM
           before do
             environment 'x', { 'description' => 'lo' }
           end
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
    "name": "x",
@@ -533,7 +533,7 @@ EOM
         end
         when_the_chef_server 'has an environment with a different value' do
           before { environment 'x', { 'description' => 'hi' } }
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x",
@@ -560,7 +560,7 @@ EOM
         end
         when_the_chef_server 'has an environment with no value' do
           before { environment 'x', {} }
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x"
@@ -574,7 +574,7 @@ EOM
           before do
             environment 'x', { 'description' => 'lo' }
           end
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
    "name": "x",
diff --git a/spec/integration/knife/list_spec.rb b/spec/integration/knife/list_spec.rb
index 3d8b83001d..911b56ef18 100644
--- a/spec/integration/knife/list_spec.rb
+++ b/spec/integration/knife/list_spec.rb
@@ -471,7 +471,7 @@ EOM
         end
       end
 
-      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory', :pending => (Chef::Platform.windows?) do
+      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory', :skip => (Chef::Platform.windows?) do
         before do
           directory 'cookbooks'
           symlink 'symlinked', 'cookbooks'
@@ -508,7 +508,7 @@ EOM
         end
       end
 
-      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it', :pending => (Chef::Platform.windows?) do
+      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it', :skip => (Chef::Platform.windows?) do
         before do
           directory 'real_cookbooks'
           symlink 'cookbooks', 'real_cookbooks'
diff --git a/spec/integration/knife/raw_spec.rb b/spec/integration/knife/raw_spec.rb
index 2b49d2ebb2..75fc8fa55e 100644
--- a/spec/integration/knife/raw_spec.rb
+++ b/spec/integration/knife/raw_spec.rb
@@ -38,7 +38,7 @@ describe 'knife raw', :workstation do
       user 'x', '{}'
     end
 
-    it 'knife raw /nodes/x returns the node', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw /nodes/x returns the node', :skip => (RUBY_VERSION < "1.9") do
       knife('raw /nodes/x').should_succeed <<EOM
 {
   "name": "x",
@@ -68,7 +68,7 @@ EOM
       knife('raw /blarghle').should_fail(/ERROR: Server responded with error 404 "Not Found\s*"/)
     end
 
-    it 'knife raw -m DELETE /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw -m DELETE /roles/x succeeds', :skip => (RUBY_VERSION < "1.9") do
       knife('raw -m DELETE /roles/x').should_succeed <<EOM
 {
   "name": "x",
@@ -92,7 +92,7 @@ EOM
       knife('show /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
     end
 
-    it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :skip => (RUBY_VERSION < "1.9") do
       Tempfile.open('raw_put_input') do |file|
         file.write <<EOM
 {
@@ -146,7 +146,7 @@ EOM
       end
     end
 
-    it 'knife raw -m POST -i blah.txt /roles succeeds', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw -m POST -i blah.txt /roles succeeds', :skip => (RUBY_VERSION < "1.9") do
       Tempfile.open('raw_put_input') do |file|
         file.write <<EOM
 {
@@ -196,7 +196,7 @@ EOM
         @raw_server_thread.kill if @raw_server_thread
       end
 
-      it 'knife raw /blah returns the prettified json', :pending => (RUBY_VERSION < "1.9") do
+      it 'knife raw /blah returns the prettified json', :skip => (RUBY_VERSION < "1.9") do
         knife('raw /blah').should_succeed <<EOM
 {
   "x": "y",
diff --git a/spec/integration/knife/show_spec.rb b/spec/integration/knife/show_spec.rb
index bc7f1cf6d3..8f1887e738 100644
--- a/spec/integration/knife/show_spec.rb
+++ b/spec/integration/knife/show_spec.rb
@@ -76,7 +76,7 @@ EOM
 }
 EOM
       end
-      it 'knife show /environments/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
+      it 'knife show /environments/x.json shows the remote version', :skip => (RUBY_VERSION < "1.9") do
         knife('show /environments/x.json').should_succeed <<EOM
 /environments/x.json:
 {
@@ -92,7 +92,7 @@ EOM
 }
 EOM
       end
-      it 'knife show /roles/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
+      it 'knife show /roles/x.json shows the remote version', :skip => (RUBY_VERSION < "1.9") do
         knife('show /roles/x.json').should_succeed <<EOM
 /roles/x.json:
 {
@@ -135,7 +135,7 @@ EOM
         'name' => 'x'
       }
     end
-    it 'knife show shows the attributes in a predetermined order', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife show shows the attributes in a predetermined order', :skip => (RUBY_VERSION < "1.9") do
       knife('show /environments/x.json').should_succeed <<EOM
 /environments/x.json:
 {