Merge branch 'specs_skip' into fix_deprecation_warnings

spec/lib/fastlib_spec.rb

@@ -91,7 +91,7 @@ describe FastLib do
             FastLib.cache[@destination_path][:fastlib_flags].should == flags
           end
 
-          pending "Fix https://www.pivotaltracker.com/story/show/38730815" do
+          skip "Fix https://www.pivotaltracker.com/story/show/38730815" do
             it 'should include header' do
               described_class.dump(@destination_path, flag_string, base_path, *unarchived_paths)
               header = FastLib.cache[@destination_path][:fastlib_header]
@@ -198,7 +198,8 @@ describe FastLib do
         end
       end
 
-      context 'with cached dump', :pending => "Fix https://www.pivotaltracker.com/story/show/38730815" do
+      skip "Fix https://www.pivotaltracker.com/story/show/38730815" do
+        context 'with cached dump' do
           it 'should have dump cached' do
             FastLib.cache[@destination_path].should_not be_nil
           end
@@ -210,6 +211,7 @@ describe FastLib do
             paths.should == archived_paths
           end
         end
+      end
 
       context 'without cached dump' do
         before(:each) do

spec/lib/msf/core/exploit/capture_spec.rb

@@ -37,16 +37,16 @@ describe Msf::Exploit::Capture do
     subject.should respond_to :open_pcap
   end
 
-  it 'should confirm that pcaprub is available', :pending => "Need to test this without stubbing check_pcaprub_loaded" do
+  it 'should confirm that pcaprub is available', :skip => "Need to test this without stubbing check_pcaprub_loaded" do
   end
 
-  it 'should open a pcap file', :pending => "Provde a sample pcap file to read" do
+  it 'should open a pcap file', :skip => "Provde a sample pcap file to read" do
   end
 
-  it 'should capture from an iface', :pending => "Mock this? Tends to need root" do
+  it 'should capture from an iface', :skip => "Mock this? Tends to need root" do
   end
 
-  it 'should inject packets to an ifrace', :pending => "Mock this? Tends to need root" do
+  it 'should inject packets to an ifrace', :skip => "Mock this? Tends to need root" do
   end
 
 end

spec/lib/msf/core/framework_spec.rb

@@ -28,7 +28,7 @@ describe Msf::Framework do
       "-#{release}".should == described_class::Release
     end
 
-    pending "conform to SemVer 2.0 syntax: http://semver.org/" do
+    skip "conform to SemVer 2.0 syntax: http://semver.org/" do
       it "should have constants that correspond to SemVer standards" do
         major,minor,patch,label = subject.version.split(/[.-]/)
         major.to_i.should == described_class::VERSION::MAJOR

spec/lib/msf/core/payload_generator_spec.rb

@@ -313,7 +313,7 @@ describe Msf::PayloadGenerator do
 
 
       it 'returns modified shellcode' do
-        pending "This is a bad test and needs to be refactored"
+        skip "This is a bad test and needs to be refactored"
         # The exact length is variable due to random nops inserted into the routine
         # It looks like it should always be > 300
         # Can't do precise output matching due to this same issue

spec/lib/msf/ui/command_dispatcher/db_spec.rb

@@ -129,7 +129,7 @@ describe Msf::Ui::Console::CommandDispatcher::Db do
         FactoryGirl.create(:mdm_service, :host => host, :port => 1026)
       end
       it "should list services that are not on a given port" do
-        pending("refs redmine ticket #4821") {
+        skip("refs redmine ticket #4821") {
           db.cmd_services "-np", "1024"
 
           @output.should =~ [

spec/lib/msf/util/exe_spec.rb

@@ -57,8 +57,8 @@ describe Msf::Util::EXE do
           fmt   = format_hash[:format]
           arch  = format_hash[:arch]
 
-          if format_hash[:pending]
-            pending "returns an executable when given arch=#{arch}, fmt=#{fmt}"
+          if format_hash[:skip]
+            skip "returns an executable when given arch=#{arch}, fmt=#{fmt}"
             next
           end
 

spec/lib/rex/post/meterpreter/packet_spec.rb

@@ -230,17 +230,17 @@ describe Rex::Post::Meterpreter::GroupTlv do
     end
 
     it "should raise an error when given something other than nil or an array" do
-      pending "RM #7598"
+      skip "RM #7598"
       group_tlv.add_tlvs("bad value").should raise_error
     end
 
     it "should raise an error when given an array of objects other than hashes" do
-      pending "RM #7598"
+      skip "RM #7598"
       group_tlv.add_tlvs([1,2,3]).should raise_error
     end
 
     it "should raise an error when any of the hashes are missing a key" do
-      pending "RM #7598"
+      skip "RM #7598"
       tlv_array = [
         {:type => Rex::Post::Meterpreter::TLV_TYPE_STRING, :value => "test"},
         {:type => Rex::Post::Meterpreter::TLV_TYPE_STRING}

spec/lib/rex/proto/http/client_spec.rb

@@ -156,27 +156,27 @@ describe Rex::Proto::Http::Client do
     cli.close.should be_nil
   end
 
-  it "should send a request and receive a response", :pending => excuse_needs_connection do
+  it "should send a request and receive a response", :skip => excuse_needs_connection do
 
   end
 
-  it "should send a request and receive a response without auth handling", :pending => excuse_needs_connection do
+  it "should send a request and receive a response without auth handling", :skip => excuse_needs_connection do
 
   end
 
-  it "should send a request", :pending => excuse_needs_connection do
+  it "should send a request", :skip => excuse_needs_connection do
 
   end
 
   it "should test for credentials" do
-    pending "Should actually respond to :has_creds" do
+    skip "Should actually respond to :has_creds" do
       cli.should_not have_creds
       this_cli = described_class.new("127.0.0.1", 1, {}, false, nil, nil, "user1", "pass1" )
       this_cli.should have_creds
     end
   end
 
-  it "should send authentication", :pending => excuse_needs_connection
+  it "should send authentication", :skip => excuse_needs_connection
 
   it "should produce a basic authentication header" do
     u = "user1"
@@ -185,15 +185,15 @@ describe Rex::Proto::Http::Client do
     cli.basic_auth_header("user1","pass1").should == "Basic #{b64}"
   end
 
-  it "should perform digest authentication", :pending => excuse_needs_auth do
+  it "should perform digest authentication", :skip => excuse_needs_auth do
 
   end
 
-  it "should perform negotiate authentication", :pending => excuse_needs_auth do
+  it "should perform negotiate authentication", :skip => excuse_needs_auth do
 
   end
 
-  it "should get a response", :pending => excuse_needs_connection do
+  it "should get a response", :skip => excuse_needs_connection do
 
   end
 

spec/support/shared/examples/options.rb

@@ -34,8 +34,8 @@ shared_examples_for "an option" do |valid_values, invalid_values, type|
           subject.normalize(valid_value).should == normalized_value
           subject.valid?(valid_value).should be_truthy
         }
-        if vhash[:pending]
-          pending(vhash[:pending], &block)
+        if vhash[:skip]
+          skip(vhash[:skip], &block)
         else
           block.call
         end
@@ -47,9 +47,9 @@ shared_examples_for "an option" do |valid_values, invalid_values, type|
     invalid_values.each do |vhash|
       invalid_value = vhash[:value]
       it "should not be valid: #{invalid_value}" do
-        block = Proc.new { subject.valid?(invalid_value).should be_falsey }
-        if vhash[:pending]
-          pending(vhash[:pending], &block)
+        block = Proc.new { subject.valid?(invalid_value).should be_false }
+        if vhash[:skip]
+          skip(vhash[:skip], &block)
         else
           block.call
         end