puppet 3.8.7 → 4.0.0.rc1

data/spec/integration/util/windows/user_spec.rb

@@ -5,55 +5,55 @@ require 'spec_helper'
 describe "Puppet::Util::Windows::User", :if => Puppet.features.microsoft_windows? do
   describe "2003 without UAC" do
     before :each do
-      Facter.stubs(:value).with(:kernelmajversion).returns("5.2")
+      Puppet::Util::Windows::Process.stubs(:windows_major_version).returns(5)
     end
 
     it "should be an admin if user's token contains the Administrators SID" do
       Puppet::Util::Windows::User.expects(:check_token_membership).returns(true)
       Puppet::Util::Windows::Process.expects(:elevated_security?).never
 
-      Puppet::Util::Windows::User.should be_admin
+      expect(Puppet::Util::Windows::User).to be_admin
     end
 
     it "should not be an admin if user's token doesn't contain the Administrators SID" do
       Puppet::Util::Windows::User.expects(:check_token_membership).returns(false)
       Puppet::Util::Windows::Process.expects(:elevated_security?).never
 
-      Puppet::Util::Windows::User.should_not be_admin
+      expect(Puppet::Util::Windows::User).not_to be_admin
     end
 
     it "should raise an exception if we can't check token membership" do
       Puppet::Util::Windows::User.expects(:check_token_membership).raises(Puppet::Util::Windows::Error, "Access denied.")
       Puppet::Util::Windows::Process.expects(:elevated_security?).never
 
-      lambda { Puppet::Util::Windows::User.admin? }.should raise_error(Puppet::Util::Windows::Error, /Access denied./)
+      expect { Puppet::Util::Windows::User.admin? }.to raise_error(Puppet::Util::Windows::Error, /Access denied./)
     end
   end
 
   describe "2008 with UAC" do
     before :each do
-      Facter.stubs(:value).with(:kernelmajversion).returns("6.0")
+      Puppet::Util::Windows::Process.stubs(:windows_major_version).returns(6)
     end
 
     it "should be an admin if user is running with elevated privileges" do
       Puppet::Util::Windows::Process.stubs(:elevated_security?).returns(true)
       Puppet::Util::Windows::User.expects(:check_token_membership).never
 
-      Puppet::Util::Windows::User.should be_admin
+      expect(Puppet::Util::Windows::User).to be_admin
     end
 
     it "should not be an admin if user is not running with elevated privileges" do
       Puppet::Util::Windows::Process.stubs(:elevated_security?).returns(false)
       Puppet::Util::Windows::User.expects(:check_token_membership).never
 
-      Puppet::Util::Windows::User.should_not be_admin
+      expect(Puppet::Util::Windows::User).not_to be_admin
     end
 
     it "should raise an exception if the process fails to open the process token" do
       Puppet::Util::Windows::Process.stubs(:elevated_security?).raises(Puppet::Util::Windows::Error, "Access denied.")
       Puppet::Util::Windows::User.expects(:check_token_membership).never
 
-      lambda { Puppet::Util::Windows::User.admin? }.should raise_error(Puppet::Util::Windows::Error, /Access denied./)
+      expect { Puppet::Util::Windows::User.admin? }.to raise_error(Puppet::Util::Windows::Error, /Access denied./)
     end
   end
 
@@ -103,22 +103,22 @@ describe "Puppet::Util::Windows::User", :if => Puppet.features.microsoft_windows
 
     describe "password_is?" do
       it "should return false given an incorrect username and password" do
-        Puppet::Util::Windows::User.password_is?(username, bad_password).should be_false
+        expect(Puppet::Util::Windows::User.password_is?(username, bad_password)).to be_falsey
       end
 
       it "should return false given an incorrect username and nil password" do
-        Puppet::Util::Windows::User.password_is?(username, nil).should be_false
+        expect(Puppet::Util::Windows::User.password_is?(username, nil)).to be_falsey
       end
 
       it "should return false given a nil username and an incorrect password" do
-        Puppet::Util::Windows::User.password_is?(nil, bad_password).should be_false
+        expect(Puppet::Util::Windows::User.password_is?(nil, bad_password)).to be_falsey
       end
     end
 
     describe "check_token_membership" do
       it "should not raise an error" do
         # added just to call an FFI code path on all platforms
-        lambda { Puppet::Util::Windows::User.check_token_membership }.should_not raise_error
+        expect { Puppet::Util::Windows::User.check_token_membership }.not_to raise_error
       end
     end
   end

data/spec/integration/util_spec.rb

@@ -9,7 +9,7 @@ describe Puppet::Util do
     it "should properly allow stdout and stderr to share a file" do
       command = "ruby -e '(1..10).each {|i| (i%2==0) ? $stdout.puts(i) : $stderr.puts(i)}'"
 
-      Puppet::Util::Execution.execute(command, :combine => true).split.should =~ [*'1'..'10']
+      expect(Puppet::Util::Execution.execute(command, :combine => true).split).to match_array([*'1'..'10'])
     end
 
     it "should return output and set $CHILD_STATUS" do
@@ -17,15 +17,15 @@ describe Puppet::Util do
 
       output = Puppet::Util::Execution.execute(command, {:failonfail => false})
 
-      output.should == "foo\n"
-      $CHILD_STATUS.exitstatus.should == 42
+      expect(output).to eq("foo\n")
+      expect($CHILD_STATUS.exitstatus).to eq(42)
     end
 
     it "should raise an error if non-zero exit status is returned" do
       command = "ruby -e 'exit 43'"
 
       expect { Puppet::Util::Execution.execute(command) }.to raise_error(Puppet::ExecutionFailure, /Execution of '#{command}' returned 43: /)
-      $CHILD_STATUS.exitstatus.should == 43
+      expect($CHILD_STATUS.exitstatus).to eq(43)
     end
 
     it "replace_file should preserve original ACEs from existing replaced file on Windows",
@@ -51,7 +51,7 @@ describe Puppet::Util do
 
       replaced_sd = Puppet::Util::Windows::Security.get_security_descriptor(file)
 
-      replaced_sd.dacl.should == expected_sd.dacl
+      expect(replaced_sd.dacl).to eq(expected_sd.dacl)
     end
 
     it "replace_file should use reasonable default ACEs on a new file on Windows",
@@ -74,7 +74,7 @@ describe Puppet::Util do
 
       new_sd = Puppet::Util::Windows::Security.get_security_descriptor(new_file_path)
 
-      new_sd.dacl.should == expected_sd.dacl
+      expect(new_sd.dacl).to eq(expected_sd.dacl)
     end
   end
 
@@ -89,7 +89,7 @@ describe Puppet::Util do
     end
 
     actual_content = File.read(destination_file)
-    actual_content.should == expected_content
+    expect(actual_content).to eq(expected_content)
   end
 
   it "replace_file should work with filenames that include special characters (PUP-1389)", :if => Puppet.features.microsoft_windows? do
@@ -106,6 +106,6 @@ describe Puppet::Util do
     end
 
     actual_content = File.read(destination_file)
-    actual_content.should == expected_content
+    expect(actual_content).to eq(expected_content)
   end
 end

data/spec/lib/matchers/containment_matchers.rb

@@ -24,7 +24,7 @@ module ContainmentMatchers
       end
     end
 
-    def failure_message_for_should
+    def failure_message
       message = "Expected #{@catalog.to_dot} to contain Class #{@containee.inspect} inside of Class #{@container.inspect} but "
 
       missing = []

data/spec/lib/matchers/include.rb

@@ -4,7 +4,7 @@ module Matchers; module Include
   matcher :include_in_any_order do |*matchers|
     match do |enumerable|
       @not_matched = []
-      expected.each do |matcher|
+      expected_as_array.each do |matcher|
         if enumerable.empty?
           break
         end
@@ -20,8 +20,8 @@ module Matchers; module Include
       @not_matched.empty? && enumerable.empty?
     end
 
-    failure_message_for_should do |enumerable|
-      "did not match #{@not_matched.collect(&:description).join(', ')} in #{enumerable.inspect}: <#{@not_matched.collect(&:failure_message_for_should).join('>, <')}>"
+    failure_message do |enumerable|
+      "did not match #{@not_matched.collect(&:description).join(', ')} in #{enumerable.inspect}: <#{@not_matched.collect(&:failure_message).join('>, <')}>"
     end
   end
 end; end

data/spec/lib/matchers/include_in_order.rb

@@ -11,11 +11,11 @@ RSpec::Matchers.define :include_in_order do |*expected|
     elements.empty?
   end
 
-  def failure_message_for_should
+  def failure_message
     "expected #{@actual.inspect} to include#{expected_to_sentence} in order"
   end
 
-  def failure_message_for_should_not
+  def failure_message_when_negated
     "expected #{@actual.inspect} not to include#{expected_to_sentence} in order"
   end
 end

data/spec/lib/matchers/json.rb

@@ -14,7 +14,7 @@ module JSONMatchers
 
     def attr_value(attrs, instance)
       attrs = attrs.dup
-      hash = json(instance)['data']
+      hash = json(instance)
       while attrs.length > 0
         name = attrs.shift
         hash = hash[name]
@@ -36,7 +36,7 @@ module JSONMatchers
       end
     end
 
-    def failure_message_for_should(instance)
+    def failure_message(instance)
       if @value
         "expected #{instance.inspect} to set #{@attributes.inspect} to #{@value.inspect}; got #{attr_value(@attributes, instance).inspect}"
       else
@@ -44,7 +44,7 @@ module JSONMatchers
       end
     end
 
-    def failure_message_for_should_not(instance)
+    def failure_message_when_negated(instance)
       if @value
         "expected #{instance.inspect} not to set #{@attributes.inspect} to #{@value.inspect}"
       else
@@ -53,32 +53,6 @@ module JSONMatchers
     end
   end
 
-  class SetJsonDocumentTypeTo
-    def initialize(type)
-      @type = type
-    end
-
-    def format
-      @format ||= Puppet::Network::FormatHandler.format('pson')
-    end
-
-    def matches?(instance)
-      json(instance)['document_type'] == @type
-    end
-
-    def json(instance)
-      PSON.parse(instance.to_pson)
-    end
-
-    def failure_message_for_should(instance)
-      "expected #{instance.inspect} to set document_type to #{@type.inspect}; got #{json(instance)['document_type'].inspect}"
-    end
-
-    def failure_message_for_should_not(instance)
-      "expected #{instance.inspect} not to set document_type to #{@type.inspect}"
-    end
-  end
-
   class ReadJsonAttribute
     def initialize(attribute)
       @attribute = attribute
@@ -109,7 +83,7 @@ module JSONMatchers
       end
     end
 
-    def failure_message_for_should(klass)
+    def failure_message(klass)
       if @value
         "expected #{klass} to read #{@attribute} from #{@json} as #{@value.inspect}; got #{@instance.send(@attribute).inspect}"
       else
@@ -117,7 +91,7 @@ module JSONMatchers
       end
     end
 
-    def failure_message_for_should_not(klass)
+    def failure_message_when_negated(klass)
       if @value
         "expected #{klass} not to set #{@attribute} to #{@value}"
       else
@@ -157,10 +131,6 @@ module JSONMatchers
     SetJsonAttribute.new(attributes)
   end
 
-  def set_json_document_type_to(type)
-    SetJsonDocumentTypeTo.new(type)
-  end
-
   def read_json_attribute(attribute)
     ReadJsonAttribute.new(attribute)
   end

data/spec/lib/matchers/match_tokens2.rb

@@ -12,7 +12,7 @@ RSpec::Matchers.define :match_tokens2 do | *expected |
     end
   end
 
-  def failure_message_for_should
+  def failure_message
     msg = ["Expected (#{expected.size}):"]
     expected.each {|e| msg << e.to_s }
 

data/spec/lib/matchers/relationship_graph_matchers.rb

@@ -19,7 +19,7 @@ module RelationshipGraphMatchers
       @forward_edge && !@reverse_edge
     end
 
-    def failure_message_for_should
+    def failure_message
       "expect #{@actual_graph.to_dot_graph} to only contain an edge from #{@before} to #{@after} but #{[forward_failure_message, reverse_failure_message].compact.join(' and ')}"
     end
 

data/spec/lib/matchers/resource.rb

@@ -1,10 +1,8 @@
 module Matchers; module Resource
   extend RSpec::Matchers::DSL
 
-  matcher :be_resource do |expected_resource|
-    @params = {}
-
-    match do |actual_resource|
+  matcher :have_resource do |expected_resource|
+    def resource_match(expected_resource, actual_resource)
       matched = true
       failures = []
 
@@ -13,6 +11,7 @@ module Matchers; module Resource
         failures << "expected #{expected_resource} but was #{actual_resource.ref}"
       end
 
+      @params ||= {}
       @params.each do |name, value|
         case value
         when RSpec::Matchers::DSL::Matcher
@@ -32,24 +31,10 @@ module Matchers; module Resource
       matched
     end
 
-    chain :with_parameter do |name, value|
-      @params[name] = value
-    end
-
-    def failure_message_for_should
-      @mismatch
-    end
-  end
-  module_function :be_resource
-
-  matcher :have_resource do |expected_resource|
-    @params = {}
-    @matcher = Matchers::Resource.be_resource(expected_resource)
-
     match do |actual_catalog|
       @mismatch = ""
       if resource = actual_catalog.resource(expected_resource)
-        @matcher.matches?(resource)
+        resource_match(expected_resource, resource)
       else
         @mismatch = "expected #{@actual.to_dot} to include #{@expected[0]}"
         false
@@ -57,12 +42,12 @@ module Matchers; module Resource
     end
 
     chain :with_parameter do |name, value|
-      @matcher.with_parameter(name, value)
+      @params ||= {}
+      @params[name] = value
     end
 
-    def failure_message_for_should
-      @mismatch.empty? ? @matcher.failure_message_for_should : @mismatch
+    def failure_message
+      @mismatch
     end
   end
-  module_function :have_resource
 end; end

data/spec/lib/puppet/face/1.0.0/huzzah.rb

@@ -3,6 +3,6 @@ Puppet::Face.define(:huzzah, '1.0.0') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
   summary "life is a thing for celebration"
-  script :obsolete_in_core do |_| "you are in obsolete core now!" end
-  script :call_newer do |_| method_on_newer end
+  action(:obsolete_in_core) { when_invoked { |_| "you are in obsolete core now!" } }
+  action(:call_newer) { when_invoked { |_| method_on_newer } }
 end

data/spec/lib/puppet/face/huzzah.rb

@@ -3,6 +3,6 @@ Puppet::Face.define(:huzzah, '2.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
   summary "life is a thing for celebration"
-  script :bar do |options| "is where beer comes from" end
-  script :call_older do |_| method_on_older end
+  action(:bar) { when_invoked { |options| "is where beer comes from" } }
+  action(:call_older) { when_invoked { |_| method_on_older } }
 end

data/spec/lib/puppet/face/version_matching.rb

@@ -7,6 +7,6 @@ require 'puppet/face'
     copyright "Puppet Labs", 2011
     license   "Apache 2 license; see COPYING"
     summary "version matching face #{version}"
-    script :version do |options| version end
+    action(:version) { when_invoked { |options| version } }
   end
 end

data/spec/lib/puppet/indirector_proxy.rb

@@ -0,0 +1,34 @@
+class Puppet::IndirectorProxy
+  class ProxyId
+    attr_accessor :name
+    def initialize(name)
+      self.name = name
+    end
+  end
+
+  # We should have some way to identify if we got a valid object back with the
+  # current values, no?
+  attr_accessor :value, :proxyname
+  alias_method :name, :value
+  alias_method :name=, :value=
+  def initialize(value, proxyname)
+    self.value = value
+    self.proxyname = proxyname
+  end
+
+  def self.indirection
+    ProxyId.new("file_metadata")
+  end
+
+  def self.from_binary(raw)
+    new(raw)
+  end
+
+  def self.from_data_hash(data)
+    new(data['value'])
+  end
+
+  def to_data_hash
+    { 'value' => value }
+  end
+end

data/spec/lib/puppet/indirector_testing.rb

@@ -1,5 +1,4 @@
 require 'puppet/indirector'
-require 'puppet/util/pson'
 
 class Puppet::IndirectorTesting
   extend Puppet::Indirector
@@ -14,11 +13,10 @@ class Puppet::IndirectorTesting
     self.value = value
   end
 
-  def self.from_raw(raw)
+  def self.from_binary(raw)
     new(raw)
   end
 
-  PSON.register_document_type('IndirectorTesting',self)
   def self.from_data_hash(data)
     new(data['value'])
   end
@@ -26,12 +24,4 @@ class Puppet::IndirectorTesting
   def to_data_hash
     { 'value' => value }
   end
-
-  def to_pson
-    {
-      'document_type' => 'IndirectorTesting',
-      'data'          => self.to_data_hash,
-      'metadata'      => { 'api_version' => 1 }
-    }.to_pson
-  end
 end