puppet 4.5.3-x86-mingw32 → 4.6.1-x86-mingw32

data/lib/puppet/util/windows/process.rb

@@ -269,6 +269,11 @@ module Puppet::Util::Windows::Process
   end
   module_function :set_environment_variable
 
+  def get_system_default_ui_language
+    GetSystemDefaultUILanguage()
+  end
+  module_function :get_system_default_ui_language
+
   # Returns whether or not the OS has the ability to set elevated
   # token information.
   #
@@ -476,4 +481,9 @@ module Puppet::Util::Windows::Process
   ffi_lib :kernel32
   attach_function_private :GetVersionExW,
     [:pointer], :win32_bool
+
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/dd318123(v=vs.85).aspx
+  # LANGID GetSystemDefaultUILanguage(void);
+  ffi_lib :kernel32
+  attach_function_private :GetSystemDefaultUILanguage, [], :word
 end

data/lib/puppet/util/windows/security.rb

@@ -262,7 +262,7 @@ module Puppet::Util::Windows::Security
   }
 
   # Set the mode of the object referenced by +path+ to the specified
-  # +mode+.  The mode should be specified as POSIX-stye read, write,
+  # +mode+. The mode should be specified as POSIX-style read, write,
   # and execute modes for the user, group, and other classes,
   # e.g. 0640. The sticky bit, S_ISVTX, is supported, but is only
   # meaningful for directories. If set, group and others are not

data/lib/puppet/util/windows/user.rb

@@ -22,6 +22,14 @@ module Puppet::Util::Windows::User
   # https://msdn.microsoft.com/en-us/library/windows/desktop/ee207397(v=vs.85).aspx
   SECURITY_MAX_SID_SIZE = 68
 
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/ms681385(v=vs.85).aspx
+  # These error codes indicate successful authentication but failure to
+  # logon for a separate reason
+  ERROR_ACCOUNT_RESTRICTION = 1327
+  ERROR_INVALID_LOGON_HOURS = 1328
+  ERROR_INVALID_WORKSTATION = 1329
+  ERROR_ACCOUNT_DISABLED    = 1331
+
   def check_token_membership
     is_admin = false
     FFI::MemoryPointer.new(:byte, SECURITY_MAX_SID_SIZE) do |sid_pointer|
@@ -52,9 +60,19 @@ module Puppet::Util::Windows::User
   module_function :check_token_membership
 
   def password_is?(name, password)
-    logon_user(name, password) { |token| }
-  rescue Puppet::Util::Windows::Error
-    false
+    begin
+      logon_user(name, password) { |token| }
+    rescue Puppet::Util::Windows::Error => detail
+
+      authenticated_error_codes = Set[
+        ERROR_ACCOUNT_RESTRICTION,
+        ERROR_INVALID_LOGON_HOURS,
+        ERROR_INVALID_WORKSTATION,
+        ERROR_ACCOUNT_DISABLED,
+      ]
+
+      return authenticated_error_codes.include?(detail.code)
+    end
   end
   module_function :password_is?
 
@@ -65,7 +83,7 @@ module Puppet::Util::Windows::User
     token = nil
     begin
       FFI::MemoryPointer.new(:handle, 1) do |token_pointer|
-        if LogonUserW(wide_string(name), wide_string('.'), wide_string(password),
+        if LogonUserW(wide_string(name), wide_string('.'), password.nil? ? FFI::Pointer::NULL : wide_string(password),
             fLOGON32_LOGON_NETWORK, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
           raise Puppet::Util::Windows::Error.new("Failed to logon user #{name.inspect}")
         end

data/lib/puppet/util/yaml.rb

@@ -9,9 +9,21 @@ module Puppet::Util::Yaml
 
   class YamlLoadError < Puppet::Error; end
 
-  def self.load_file(filename, default_value = false)
-    yaml = YAML.load_file(filename)
-    yaml || default_value
+  def self.load_file(filename, default_value = false, strip_classes = false)
+    if(strip_classes) then
+      data = YAML::parse_file(filename)
+      data.root.each do |o|
+        if o.respond_to?(:tag=) and
+           o.tag != nil and
+           o.tag.start_with?("!ruby")
+          o.tag = nil
+        end
+      end
+      data.to_ruby || default_value
+    else
+      yaml = YAML.load_file(filename)
+      yaml || default_value
+    end
   rescue *YamlLoadExceptions => detail
     raise YamlLoadError.new(detail.message, detail)
   end

data/lib/puppet/vendor/deep_merge/test/test_deep_merge.rb

@@ -213,7 +213,7 @@ class TestDeepMerge < Test::Unit::TestCase
     DeepMerge::deep_merge!(hash_src, hash_dst)
     assert_equal({"property" => {"bedroom_count" => {"king_bed" => [nil, 3], "queen_bed" => [4, nil, 1]}, "bathroom_count" => [nil, "2", "1"]}}, hash_dst)
 
-    # test parameter management for knockout_prefix and overwrite unmergable
+    # test parameter management for knockout_prefix and overwrite unmergeable
     assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => ""})}
     assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => ""})}
     assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => "--"})}

data/lib/puppet/vendor/rgen_patch.rb

@@ -12,7 +12,7 @@
 #
 # This patch changes the implementation so that the test for MMBase/
 # MMGeneric is made prior to the iteration, thus avoiding the iteration
-# alltogether for all non model objects
+# altogether for all non model objects
 #
 # The patch also changes the setXXX method to allow it to optimize the way
 # it ensures that the added elements are unique. Calling the addXXX method

data/lib/puppet/version.rb

@@ -2,12 +2,12 @@
 # simple `require 'puppet/version'` allows a rubygems gemspec or bundler
 # Gemfile to get the Puppet version of the gem install.
 #
-# The version is programatically settable because we want to allow the
+# The version can be set programmatically because we want to allow the
 # Raketasks and such to set the version based on the output of `git describe`
 
 
 module Puppet
-  PUPPETVERSION = '4.5.3'
+  PUPPETVERSION = '4.6.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/fixtures/unit/pops/loaders/loaders/no_modules/manifests/site.pp

@@ -0,0 +1,10 @@
+function bar() {
+  $value_from_scope
+}
+
+class foo::bar {
+  with(1) |$x| { notice $x }
+  notify { bar(): }
+}
+
+include foo::bar

data/spec/integration/agent/logging_spec.rb

@@ -86,21 +86,22 @@ describe 'agent logging' do
       end
 
     else
-
-      it "when evoked with #{argv}, logs to #{expected[:loggers].inspect} at level #{expected[:level]}" do
-        # This logger is created by the Puppet::Settings object which creates and
-        # applies a catalog to ensure that configuration files and users are in
-        # place.
-        #
-        # It's not something we are specifically testing here since it occurs
-        # regardless of user flags.
-        Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).at_least_once
-        expected[:loggers].each do |logclass|
-          Puppet::Util::Log.expects(:newdestination).with(logclass).at_least_once
+      if no_log_dest_set_in(argv)
+        it "when evoked with #{argv}, logs to #{expected[:loggers].inspect} at level #{expected[:level]}" do
+          # This logger is created by the Puppet::Settings object which creates and
+          # applies a catalog to ensure that configuration files and users are in
+          # place.
+          #
+          # It's not something we are specifically testing here since it occurs
+          # regardless of user flags.
+          Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).at_least_once
+          expected[:loggers].each do |logclass|
+            Puppet::Util::Log.expects(:newdestination).with(logclass).at_least_once
+          end
+          double_of_bin_puppet_agent_call(argv)
+
+          expect(Puppet::Util::Log.level).to eq(expected[:level])
         end
-        double_of_bin_puppet_agent_call(argv)
-
-        expect(Puppet::Util::Log.level).to eq(expected[:level])
       end
 
     end

data/spec/integration/application/apply_spec.rb

@@ -202,5 +202,6 @@ describe "apply" do
         expect(logs).to include(match(/doesn't match server specified environment/))
       end
     end
+
   end
 end

data/spec/integration/directory_environments_spec.rb

@@ -29,6 +29,22 @@ describe "directory environments" do
         expect { puppet.run }.to exit_with(0)
       end.to have_printed('/completely/different')
     end
+
+    it 'given an 8.3 style path on Windows, will config print an expanded path',
+      :if => Puppet::Util::Platform.windows? do
+
+      # ensure an 8.3 style path is set for environmentpath
+      shortened = Puppet::Util::Windows::File.get_short_pathname(Puppet[:environmentpath])
+      expanded = Puppet::FileSystem.expand_path(shortened)
+
+      Puppet[:environmentpath] = shortened
+      expect(Puppet[:environmentpath]).to match(/~/)
+
+      Puppet.settings.initialize_global_settings(args)
+      expect do
+        expect { puppet.run }.to exit_with(0)
+      end.to have_printed(expanded)
+    end
   end
 
   context "with an environmentpath having multiple directories" do

data/spec/integration/environments/settings_spec.rb

@@ -62,15 +62,43 @@ describe "environment settings" do
       end
 
       it "reads the configured manifest" do
-        expect(Puppet.settings.value(:manifest, :testing)).to eq(File.expand_path('/special/manifest'))
+        expect(Puppet.settings.value(:manifest, :testing)).to eq(Puppet::FileSystem.expand_path('/special/manifest'))
       end
 
       it "reads the configured modulepath" do
-        expect(Puppet.settings.value(:modulepath, :testing)).to eq(File.expand_path('/special/modulepath'))
+        expect(Puppet.settings.value(:modulepath, :testing)).to eq(Puppet::FileSystem.expand_path('/special/modulepath'))
       end
 
       it "reads the configured config_version" do
-        expect(Puppet.settings.value(:config_version, :testing)).to eq(File.expand_path('/special/config_version'))
+        expect(Puppet.settings.value(:config_version, :testing)).to eq(Puppet::FileSystem.expand_path('/special/config_version'))
+      end
+    end
+
+    context "with an environment.conf containing 8.3 style Windows paths",
+      :if => Puppet::Util::Platform.windows? do
+
+      before(:each) do
+        # set 8.3 style Windows paths
+        @modulepath = Puppet::Util::Windows::File.get_short_pathname(PuppetSpec::Files.tmpdir('fakemodulepath'))
+
+        # for expansion to work, the file must actually exist
+        @manifest = PuppetSpec::Files.tmpfile('foo.pp', @modulepath)
+        # but tmpfile won't create an empty file
+        Puppet::FileSystem.touch(@manifest)
+        @manifest = Puppet::Util::Windows::File.get_short_pathname(@manifest)
+
+        set_environment_conf(environmentpath, 'testing', <<-EOF)
+          manifest=#{@manifest}
+          modulepath=#{@modulepath}
+        EOF
+      end
+
+      it "reads the configured manifest as a fully expanded path" do
+        expect(Puppet.settings.value(:manifest, :testing)).to eq(Puppet::FileSystem.expand_path(@manifest))
+      end
+
+      it "reads the configured modulepath as a fully expanded path" do
+        expect(Puppet.settings.value(:modulepath, :testing)).to eq(Puppet::FileSystem.expand_path(@modulepath))
       end
     end
 
@@ -91,7 +119,7 @@ describe "environment settings" do
 
         it "reads manifest from environment.conf settings" do
           expect(Puppet.settings.value(:environmentpath)).to eq(environmentpath)
-          expect(Puppet.settings.value(:manifest, :main)).to eq(File.expand_path("/special/manifest"))
+          expect(Puppet.settings.value(:manifest, :main)).to eq(Puppet::FileSystem.expand_path("/special/manifest"))
         end
       end
     end

data/spec/integration/faces/documentation_spec.rb

@@ -46,7 +46,7 @@ describe "documentation of faces" do
       context "licensing of Puppet Labs face '#{face_name}'" do
         subject { Puppet::Face[face_name, :current] }
         its :license   do should =~ /Apache\s*2/ end
-        its :copyright do should =~ /Puppet Labs/ end
+        its :copyright do should =~ /Puppet Labs|Puppet Inc\./ end
 
         # REVISIT: This is less that ideal, I think, but right now I am more
         # comfortable watching us ship with some copyright than without any; we

data/spec/integration/network/http/api/indirected_routes_spec.rb

@@ -2,6 +2,8 @@
 require 'spec_helper'
 require 'puppet/network/http'
 require 'puppet/network/http/api/indirected_routes'
+require 'rack/mock' if Puppet.features.rack?
+require 'puppet/network/http/rack/rest'
 require 'puppet/indirector_proxy'
 require 'puppet_spec/files'
 require 'puppet_spec/network'
@@ -52,5 +54,36 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
         end
       end
     end
+
+    describe "an error from IndirectedRoutes", :if => Puppet.features.rack? do
+      let(:handler) { Puppet::Network::HTTP::RackREST.new }
+
+      describe "returns json" do
+        it "when a standard error" do
+          response = Rack::Response.new
+          request = Rack::Request.new(
+            Rack::MockRequest.env_for("/puppet/v3/invalid-indirector"))
+
+          handler.process(request, response)
+
+          expect(response.header["Content-Type"]).to match(/json/)
+          resp = JSON.parse(response.body.first)
+          expect(resp["message"]).to match(/The indirection name must be purely alphanumeric/)
+          expect(resp["issue_kind"]).to be_a_kind_of(String)
+        end
+        it "when a server error" do
+          response = Rack::Response.new
+          request = Rack::Request.new(
+            Rack::MockRequest.env_for("/puppet/v3/unknown_indirector"))
+
+          handler.process(request, response)
+
+          expect(response.header["Content-Type"]).to match(/json/)
+          resp = JSON.parse(response.body.first)
+          expect(resp["message"]).to match(/Could not find indirection/)
+          expect(resp["issue_kind"]).to be_a_kind_of(String)
+        end
+      end
+    end
   end
 end

data/spec/integration/node/environment_spec.rb

@@ -37,6 +37,27 @@ describe Puppet::Node::Environment do
     end
   end
 
+  it "should expand 8.3 paths on Windows when creating an environment",
+    :if => Puppet::Util::Platform.windows? do
+
+    # asking for short names only works on paths that exist
+    base = Puppet::Util::Windows::File.get_short_pathname(tmpdir("env_modules"))
+    parent_modules_dir = File.join(base, 'testmoduledir')
+
+    # make sure the paths have ~ in them, indicating unexpanded 8.3 paths
+    expect(parent_modules_dir).to match(/~/)
+
+    module_dir = a_module_in('testmodule', parent_modules_dir)
+
+    # create the environment with unexpanded 8.3 paths
+    environment = Puppet::Node::Environment.create(:foo, [parent_modules_dir])
+
+    # and expect fully expanded paths inside the environment
+    # necessary for comparing module paths internally by the parser
+    expect(environment.modulepath).to eq([Puppet::FileSystem.expand_path(parent_modules_dir)])
+    expect(environment.modules.first.path).to eq(Puppet::FileSystem.expand_path(module_dir))
+  end
+
   it "should not yield the same module from different module paths" do
     base = tmpfile("env_modules")
     Dir.mkdir(base)

data/spec/integration/parser/collection_spec.rb

@@ -201,6 +201,16 @@ describe 'collectors' do
       end.to raise_error(/Resource type someresource doesn't exist/)
     end
 
+    it 'allows query for literal undef' do
+      expect_the_message_to_be(["foo::baz::quux"], <<-MANIFEST)
+        define foo ($x = undef, $y = undef) {
+          notify { 'testing': message => "foo::${x}::${y}" }
+        }
+        foo { 'bar': y => 'quux' }
+        Foo <| x == undef |> { x => 'baz' }
+      MANIFEST
+    end
+
     context "overrides" do
       it "modifies an existing array" do
         expect_the_message_to_be([["original message", "extra message"]], <<-MANIFEST)

data/spec/integration/parser/compiler_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'matchers/resource'
 
+# COPY OF UNIT TEST
 class CompilerTestResource
   attr_accessor :builtin, :virtual, :evaluated, :type, :title
 
@@ -83,435 +84,8 @@ describe Puppet::Parser::Compiler do
     @scope.resource = @scope_resource
   end
 
-  it "should fail intelligently when a class-level compile fails" do
-    Puppet::Parser::Compiler.expects(:new).raises ArgumentError
-    expect { Puppet::Parser::Compiler.compile(@node) }.to raise_error(Puppet::Error)
-  end
-
-  it "should use the node's environment as its environment" do
-    expect(@compiler.environment).to equal(@node.environment)
-  end
-
-  it "fails if the node's environment has validation errors" do
-    conflicted_environment = Puppet::Node::Environment.create(:testing, [], '/some/environment.conf/manifest.pp')
-    conflicted_environment.stubs(:validation_errors).returns(['bad environment'])
-    @node.environment = conflicted_environment
-    expect { Puppet::Parser::Compiler.compile(@node) }.to raise_error(Puppet::Error, /Compilation has been halted because.*bad environment/)
-  end
-
-  it "should include the resource type collection helper" do
-    expect(Puppet::Parser::Compiler.ancestors).to be_include(Puppet::Resource::TypeCollectionHelper)
-  end
-
-  it "should be able to return a class list containing all added classes" do
-    @compiler.add_class ""
-    @compiler.add_class "one"
-    @compiler.add_class "two"
-
-    expect(@compiler.classlist.sort).to eq(%w{one two}.sort)
-  end
-
-  describe "when initializing" do
-
-    it "should set its node attribute" do
-      expect(@compiler.node).to equal(@node)
-    end
-    it "should detect when ast nodes are absent" do
-      expect(@compiler.ast_nodes?).to be_falsey
-    end
-
-    it "should detect when ast nodes are present" do
-      @known_resource_types.expects(:nodes?).returns true
-      expect(@compiler.ast_nodes?).to be_truthy
-    end
-
-    it "should copy the known_resource_types version to the catalog" do
-      expect(@compiler.catalog.version).to eq(@known_resource_types.version)
-    end
-
-    it "should copy any node classes into the class list" do
-      node = Puppet::Node.new("mynode")
-      node.classes = %w{foo bar}
-      compiler = Puppet::Parser::Compiler.new(node)
-
-      expect(compiler.classlist).to match_array(['foo', 'bar'])
-    end
-
-    it "should transform node class hashes into a class list" do
-      node = Puppet::Node.new("mynode")
-      node.classes = {'foo'=>{'one'=>'p1'}, 'bar'=>{'two'=>'p2'}}
-      compiler = Puppet::Parser::Compiler.new(node)
-
-      expect(compiler.classlist).to match_array(['foo', 'bar'])
-    end
-
-    it "should add a 'main' stage to the catalog" do
-      expect(@compiler.catalog.resource(:stage, :main)).to be_instance_of(Puppet::Parser::Resource)
-    end
-  end
-
-  describe "when managing scopes" do
-
-    it "should create a top scope" do
-      expect(@compiler.topscope).to be_instance_of(Puppet::Parser::Scope)
-    end
-
-    it "should be able to create new scopes" do
-      expect(@compiler.newscope(@compiler.topscope)).to be_instance_of(Puppet::Parser::Scope)
-    end
-
-    it "should set the parent scope of the new scope to be the passed-in parent" do
-      scope = mock 'scope'
-      newscope = @compiler.newscope(scope)
-
-      expect(newscope.parent).to equal(scope)
-    end
-
-    it "should set the parent scope of the new scope to its topscope if the parent passed in is nil" do
-      scope = mock 'scope'
-      newscope = @compiler.newscope(nil)
-
-      expect(newscope.parent).to equal(@compiler.topscope)
-    end
-  end
-
-  describe "when compiling" do
-
-    def compile_methods
-      [:set_node_parameters, :evaluate_main, :evaluate_ast_node, :evaluate_node_classes, :evaluate_generators, :fail_on_unevaluated,
-        :finish, :store, :extract, :evaluate_relationships]
-    end
-
-    # Stub all of the main compile methods except the ones we're specifically interested in.
-    def compile_stub(*except)
-      (compile_methods - except).each { |m| @compiler.stubs(m) }
-    end
-
-    it "should set node parameters as variables in the top scope" do
-      params = {"a" => "b", "c" => "d"}
-      @node.stubs(:parameters).returns(params)
-      compile_stub(:set_node_parameters)
-      @compiler.compile
-      expect(@compiler.topscope['a']).to eq("b")
-      expect(@compiler.topscope['c']).to eq("d")
-    end
-
-    it "should set the client and server versions on the catalog" do
-      params = {"clientversion" => "2", "serverversion" => "3"}
-      @node.stubs(:parameters).returns(params)
-      compile_stub(:set_node_parameters)
-      @compiler.compile
-      expect(@compiler.catalog.client_version).to eq("2")
-      expect(@compiler.catalog.server_version).to eq("3")
-    end
-
-    it "should evaluate the main class if it exists" do
-      compile_stub(:evaluate_main)
-      main_class = @known_resource_types.add Puppet::Resource::Type.new(:hostclass, "")
-      main_class.expects(:evaluate_code).with { |r| r.is_a?(Puppet::Parser::Resource) }
-      @compiler.topscope.expects(:source=).with(main_class)
-
-      @compiler.compile
-    end
-
-    it "should create a new, empty 'main' if no main class exists" do
-      compile_stub(:evaluate_main)
-      @compiler.compile
-      expect(@known_resource_types.find_hostclass("")).to be_instance_of(Puppet::Resource::Type)
-    end
-
-    it "should add an edge between the main stage and main class" do
-      @compiler.compile
-      expect(stage = @compiler.catalog.resource(:stage, "main")).to be_instance_of(Puppet::Parser::Resource)
-      expect(klass = @compiler.catalog.resource(:class, "")).to be_instance_of(Puppet::Parser::Resource)
-
-      expect(@compiler.catalog.edge?(stage, klass)).to be_truthy
-    end
-
-    it "should evaluate all added collections" do
-      colls = []
-      # And when the collections fail to evaluate.
-      colls << mock("coll1-false")
-      colls << mock("coll2-false")
-      colls.each { |c| c.expects(:evaluate).returns(false) }
-
-      @compiler.add_collection(colls[0])
-      @compiler.add_collection(colls[1])
-
-      compile_stub(:evaluate_generators)
-      @compiler.compile
-    end
-
-    it "should ignore builtin resources" do
-      resource = resource(:file, "testing")
-
-      @compiler.add_resource(@scope, resource)
-      resource.expects(:evaluate).never
-
-      @compiler.compile
-    end
-
-    it "should evaluate unevaluated resources" do
-      resource = CompilerTestResource.new(:file, "testing")
-
-      @compiler.add_resource(@scope, resource)
-
-      # We have to now mark the resource as evaluated
-      resource.expects(:evaluate).with { |*whatever| resource.evaluated = true }
-
-      @compiler.compile
-    end
-
-    it "should not evaluate already-evaluated resources" do
-      resource = resource(:file, "testing")
-      resource.stubs(:evaluated?).returns true
-
-      @compiler.add_resource(@scope, resource)
-      resource.expects(:evaluate).never
-
-      @compiler.compile
-    end
-
-    it "should evaluate unevaluated resources created by evaluating other resources" do
-      resource = CompilerTestResource.new(:file, "testing")
-      @compiler.add_resource(@scope, resource)
-
-      resource2 = CompilerTestResource.new(:file, "other")
-
-      # We have to now mark the resource as evaluated
-      resource.expects(:evaluate).with { |*whatever| resource.evaluated = true; @compiler.add_resource(@scope, resource2) }
-      resource2.expects(:evaluate).with { |*whatever| resource2.evaluated = true }
-
-
-      @compiler.compile
-    end
-
-    describe "when finishing" do
-      before do
-        @compiler.send(:evaluate_main)
-        @catalog = @compiler.catalog
-      end
-
-      def add_resource(name, parent = nil)
-        resource = Puppet::Parser::Resource.new "file", name, :scope => @scope
-        @compiler.add_resource(@scope, resource)
-        @catalog.add_edge(parent, resource) if parent
-        resource
-      end
-
-      it "should call finish() on all resources" do
-        # Add a resource that does respond to :finish
-        resource = Puppet::Parser::Resource.new "file", "finish", :scope => @scope
-        resource.expects(:finish)
-
-        @compiler.add_resource(@scope, resource)
-
-        # And one that does not
-        dnf_resource = stub_everything "dnf", :ref => "File[dnf]", :type => "file"
-
-        @compiler.add_resource(@scope, dnf_resource)
-
-        @compiler.send(:finish)
-      end
-
-      it "should call finish() in add_resource order" do
-        resources = sequence('resources')
-
-        resource1 = add_resource("finish1")
-        resource1.expects(:finish).in_sequence(resources)
-
-        resource2 = add_resource("finish2")
-        resource2.expects(:finish).in_sequence(resources)
-
-        @compiler.send(:finish)
-      end
-
-      it "should add each container's metaparams to its contained resources" do
-        main = @catalog.resource(:class, :main)
-        main[:noop] = true
-
-        resource1 = add_resource("meh", main)
-
-        @compiler.send(:finish)
-        expect(resource1[:noop]).to be_truthy
-      end
-
-      it "should add metaparams recursively" do
-        main = @catalog.resource(:class, :main)
-        main[:noop] = true
-
-        resource1 = add_resource("meh", main)
-        resource2 = add_resource("foo", resource1)
-
-        @compiler.send(:finish)
-        expect(resource2[:noop]).to be_truthy
-      end
-
-      it "should prefer metaparams from immediate parents" do
-        main = @catalog.resource(:class, :main)
-        main[:noop] = true
-
-        resource1 = add_resource("meh", main)
-        resource2 = add_resource("foo", resource1)
-
-        resource1[:noop] = false
-
-        @compiler.send(:finish)
-        expect(resource2[:noop]).to be_falsey
-      end
-
-      it "should merge tags downward" do
-        main = @catalog.resource(:class, :main)
-        main.tag("one")
-
-        resource1 = add_resource("meh", main)
-        resource1.tag "two"
-        resource2 = add_resource("foo", resource1)
-
-        @compiler.send(:finish)
-        expect(resource2.tags).to be_include("one")
-        expect(resource2.tags).to be_include("two")
-      end
-
-      it "should work if only middle resources have metaparams set" do
-        main = @catalog.resource(:class, :main)
-
-        resource1 = add_resource("meh", main)
-        resource1[:noop] = true
-        resource2 = add_resource("foo", resource1)
-
-        @compiler.send(:finish)
-        expect(resource2[:noop]).to be_truthy
-      end
-    end
-
-    it "should return added resources in add order" do
-      resource1 = resource(:file, "yay")
-      @compiler.add_resource(@scope, resource1)
-      resource2 = resource(:file, "youpi")
-      @compiler.add_resource(@scope, resource2)
-
-      expect(@compiler.resources).to eq([resource1, resource2])
-    end
-
-    it "should add resources that do not conflict with existing resources" do
-      resource = resource(:file, "yay")
-      @compiler.add_resource(@scope, resource)
-
-      expect(@compiler.catalog).to be_vertex(resource)
-    end
-
-    it "should fail to add resources that conflict with existing resources" do
-      path = make_absolute("/foo")
-      file1 = resource(:file, path)
-      file2 = resource(:file, path)
-
-      @compiler.add_resource(@scope, file1)
-      expect { @compiler.add_resource(@scope, file2) }.to raise_error(Puppet::Resource::Catalog::DuplicateResourceError)
-    end
-
-    it "should add an edge from the scope resource to the added resource" do
-      resource = resource(:file, "yay")
-      @compiler.add_resource(@scope, resource)
-
-      expect(@compiler.catalog).to be_edge(@scope.resource, resource)
-    end
-
-    it "should not add non-class resources that don't specify a stage to the 'main' stage" do
-      main = @compiler.catalog.resource(:stage, :main)
-      resource = resource(:file, "foo")
-      @compiler.add_resource(@scope, resource)
-
-      expect(@compiler.catalog).not_to be_edge(main, resource)
-    end
-
-    it "should not add any parent-edges to stages" do
-      stage = resource(:stage, "other")
-      @compiler.add_resource(@scope, stage)
-
-      @scope.resource = resource(:class, "foo")
-
-      expect(@compiler.catalog.edge?(@scope.resource, stage)).to be_falsey
-    end
-
-    it "should not attempt to add stages to other stages" do
-      other_stage = resource(:stage, "other")
-      second_stage = resource(:stage, "second")
-      @compiler.add_resource(@scope, other_stage)
-      @compiler.add_resource(@scope, second_stage)
-
-      second_stage[:stage] = "other"
-
-      expect(@compiler.catalog.edge?(other_stage, second_stage)).to be_falsey
-    end
-
-    it "should have a method for looking up resources" do
-      resource = resource(:yay, "foo")
-      @compiler.add_resource(@scope, resource)
-      expect(@compiler.findresource("Yay[foo]")).to equal(resource)
-    end
-
-    it "should be able to look resources up by type and title" do
-      resource = resource(:yay, "foo")
-      @compiler.add_resource(@scope, resource)
-      expect(@compiler.findresource("Yay", "foo")).to equal(resource)
-    end
-
-    it "should not evaluate virtual defined resources" do
-      resource = resource(:file, "testing")
-      resource.virtual = true
-      @compiler.add_resource(@scope, resource)
-
-      resource.expects(:evaluate).never
-
-      @compiler.compile
-    end
-  end
-
+  # NEW INTEGRATION TEST
   describe "when evaluating collections" do
-
-    it "should evaluate each collection" do
-      2.times { |i|
-        coll = mock 'coll%s' % i
-        @compiler.add_collection(coll)
-
-        # This is the hard part -- we have to emulate the fact that
-        # collections delete themselves if they are done evaluating.
-        coll.expects(:evaluate).with do
-          @compiler.delete_collection(coll)
-        end
-      }
-
-      @compiler.compile
-    end
-
-    it "should not fail when there are unevaluated resource collections that do not refer to specific resources" do
-      coll = stub 'coll', :evaluate => false
-      coll.expects(:unresolved_resources).returns(nil)
-
-      @compiler.add_collection(coll)
-
-      expect { @compiler.compile }.not_to raise_error
-    end
-
-    it "should fail when there are unevaluated resource collections that refer to a specific resource" do
-      coll = stub 'coll', :evaluate => false
-      coll.expects(:unresolved_resources).returns(:something)
-
-      @compiler.add_collection(coll)
-
-      expect { @compiler.compile }.to raise_error(Puppet::ParseError, 'Failed to realize virtual resources something')
-    end
-
-    it "should fail when there are unevaluated resource collections that refer to multiple specific resources" do
-      coll = stub 'coll', :evaluate => false
-      coll.expects(:unresolved_resources).returns([:one, :two])
-
-      @compiler.add_collection(coll)
-
-      expect { @compiler.compile }.to raise_error(Puppet::ParseError, 'Failed to realize virtual resources one, two')
-    end
-
     it 'matches on container inherited tags' do
       Puppet[:code] = <<-MANIFEST
       class xport_test {
@@ -539,364 +113,10 @@ describe Puppet::Parser::Compiler do
     end
   end
 
-  describe "when evaluating relationships" do
-    it "should evaluate each relationship with its catalog" do
-      dep = stub 'dep'
-      dep.expects(:evaluate).with(@compiler.catalog)
-      @compiler.add_relationship dep
-      @compiler.evaluate_relationships
-    end
-  end
-
-  describe "when told to evaluate missing classes" do
-
-    it "should fail if there's no source listed for the scope" do
-      scope = stub 'scope', :source => nil
-      expect { @compiler.evaluate_classes(%w{one two}, scope) }.to raise_error(Puppet::DevError)
-    end
-
-    it "should raise an error if a class is not found" do
-      @scope.expects(:find_hostclass).with("notfound").returns(nil)
-      expect{ @compiler.evaluate_classes(%w{notfound}, @scope) }.to raise_error(Puppet::Error, /Could not find class/)
-    end
-
-    it "should raise an error when it can't find class" do
-      klasses = {'foo'=>nil}
-      @node.classes = klasses
-      @compiler.topscope.expects(:find_hostclass).with('foo').returns(nil)
-      expect{ @compiler.compile }.to raise_error(Puppet::Error, /Could not find class foo for testnode/)
-    end
-  end
-
-  describe "when evaluating found classes" do
-
-    before do
-      Puppet.settings[:data_binding_terminus] = "none"
-      @class = stub 'class', :name => "my::class"
-      @scope.stubs(:find_hostclass).with("myclass").returns(@class)
-
-      @resource = stub 'resource', :ref => "Class[myclass]", :type => "file"
-    end
-
-    around do |example|
-      Puppet.override(
-        :environments => Puppet::Environments::Static.new(environment),
-        :description => "Static loader for specs"
-      ) do
-        example.run
-      end
-    end
-
-    it "should evaluate each class" do
-      @compiler.catalog.stubs(:tag)
-
-      @class.expects(:ensure_in_catalog).with(@scope)
-      @scope.stubs(:class_scope).with(@class)
-
-      @compiler.evaluate_classes(%w{myclass}, @scope)
-    end
-
-    describe "and the classes are specified as a hash with parameters" do
-      before do
-        @node.classes = {}
-        @ast_obj = Puppet::Parser::AST::Leaf.new(:value => 'foo')
-      end
-
-      # Define the given class with default parameters
-      def define_class(name, parameters)
-        @node.classes[name] = parameters
-        klass = Puppet::Resource::Type.new(:hostclass, name, :arguments => {'p1' => @ast_obj, 'p2' => @ast_obj})
-        @compiler.topscope.known_resource_types.add klass
-      end
-
-      def compile
-        @catalog = @compiler.compile
-      end
-
-      it "should record which classes are evaluated" do
-        classes = {'foo'=>{}, 'bar::foo'=>{}, 'bar'=>{}}
-        classes.each { |c, params| define_class(c, params) }
-        compile()
-        classes.each { |name, p| expect(@catalog.classes).to include(name) }
-      end
-
-      it "should provide default values for parameters that have no values specified" do
-        define_class('foo', {})
-        compile()
-        expect(@catalog.resource(:class, 'foo')['p1']).to eq("foo")
-      end
-
-      it "should use any provided values" do
-        define_class('foo', {'p1' => 'real_value'})
-        compile()
-        expect(@catalog.resource(:class, 'foo')['p1']).to eq("real_value")
-      end
-
-      it "should support providing some but not all values" do
-        define_class('foo', {'p1' => 'real_value'})
-        compile()
-        expect(@catalog.resource(:class, 'Foo')['p1']).to eq("real_value")
-        expect(@catalog.resource(:class, 'Foo')['p2']).to eq("foo")
-      end
-
-      it "should ensure each node class is in catalog and has appropriate tags" do
-        klasses = ['bar::foo']
-        @node.classes = klasses
-        ast_obj = Puppet::Parser::AST::Leaf.new(:value => 'foo')
-        klasses.each do |name|
-          klass = Puppet::Resource::Type.new(:hostclass, name, :arguments => {'p1' => ast_obj, 'p2' => ast_obj})
-          @compiler.topscope.known_resource_types.add klass
-        end
-        catalog = @compiler.compile
-
-        r2 = catalog.resources.detect {|r| r.title == 'Bar::Foo' }
-        expect(r2.tags).to eq(Puppet::Util::TagSet.new(['bar::foo', 'class', 'bar', 'foo']))
-      end
-    end
-
-    it "should fail if required parameters are missing" do
-      klass = {'foo'=>{'a'=>'one'}}
-      @node.classes = klass
-      klass = Puppet::Resource::Type.new(:hostclass, 'foo', :arguments => {'a' => nil, 'b' => nil})
-      @compiler.topscope.known_resource_types.add klass
-      expect { @compiler.compile }.to raise_error(Puppet::PreformattedError, /Class\[Foo\]: expects a value for parameter 'b'/)
-    end
-
-    it "should fail if invalid parameters are passed" do
-      klass = {'foo'=>{'3'=>'one'}}
-      @node.classes = klass
-      klass = Puppet::Resource::Type.new(:hostclass, 'foo', :arguments => {})
-      @compiler.topscope.known_resource_types.add klass
-      expect { @compiler.compile }.to raise_error(Puppet::PreformattedError, /Class\[Foo\]: has no parameter named '3'/)
-    end
-
-    it "should ensure class is in catalog without params" do
-      @node.classes = klasses = {'foo'=>nil}
-      foo = Puppet::Resource::Type.new(:hostclass, 'foo')
-      @compiler.topscope.known_resource_types.add foo
-      catalog = @compiler.compile
-      expect(catalog.classes).to include 'foo'
-    end
-
-    it "should not evaluate the resources created for found classes unless asked" do
-      @compiler.catalog.stubs(:tag)
-
-      @resource.expects(:evaluate).never
-
-      @class.expects(:ensure_in_catalog).returns(@resource)
-      @scope.stubs(:class_scope).with(@class)
-
-      @compiler.evaluate_classes(%w{myclass}, @scope)
-    end
-
-    it "should immediately evaluate the resources created for found classes when asked" do
-      @compiler.catalog.stubs(:tag)
-
-      @resource.expects(:evaluate)
-      @class.expects(:ensure_in_catalog).returns(@resource)
-      @scope.stubs(:class_scope).with(@class)
-
-      @compiler.evaluate_classes(%w{myclass}, @scope, false)
-    end
-
-    it "should skip classes that have already been evaluated" do
-      @compiler.catalog.stubs(:tag)
-
-      @scope.stubs(:class_scope).with(@class).returns(@scope)
-
-      @compiler.expects(:add_resource).never
-
-      @resource.expects(:evaluate).never
-
-      Puppet::Parser::Resource.expects(:new).never
-      @compiler.evaluate_classes(%w{myclass}, @scope, false)
-    end
-
-    it "should skip classes previously evaluated with different capitalization" do
-      @compiler.catalog.stubs(:tag)
-      @scope.stubs(:find_hostclass).with("MyClass").returns(@class)
-      @scope.stubs(:class_scope).with(@class).returns(@scope)
-      @compiler.expects(:add_resource).never
-      @resource.expects(:evaluate).never
-      Puppet::Parser::Resource.expects(:new).never
-      @compiler.evaluate_classes(%w{MyClass}, @scope, false)
-    end
-  end
-
-  describe "when evaluating AST nodes with no AST nodes present" do
-
-    it "should do nothing" do
-      @compiler.expects(:ast_nodes?).returns(false)
-      @compiler.known_resource_types.expects(:nodes).never
-      Puppet::Parser::Resource.expects(:new).never
-
-      @compiler.send(:evaluate_ast_node)
-    end
-  end
-
-  describe "when evaluating AST nodes with AST nodes present" do
-
-    before do
-      @compiler.known_resource_types.stubs(:nodes?).returns true
-
-      # Set some names for our test
-      @node.stubs(:names).returns(%w{a b c})
-      @compiler.known_resource_types.stubs(:node).with("a").returns(nil)
-      @compiler.known_resource_types.stubs(:node).with("b").returns(nil)
-      @compiler.known_resource_types.stubs(:node).with("c").returns(nil)
-
-      # It should check this last, of course.
-      @compiler.known_resource_types.stubs(:node).with("default").returns(nil)
-    end
-
-    it "should fail if the named node cannot be found" do
-      expect { @compiler.send(:evaluate_ast_node) }.to raise_error(Puppet::ParseError)
-    end
-
-    it "should evaluate the first node class matching the node name" do
-      node_class = stub 'node', :name => "c", :evaluate_code => nil
-      @compiler.known_resource_types.stubs(:node).with("c").returns(node_class)
-
-      node_resource = stub 'node resource', :ref => "Node[c]", :evaluate => nil, :type => "node"
-      node_class.expects(:ensure_in_catalog).returns(node_resource)
-
-      @compiler.compile
-    end
-
-    it "should match the default node if no matching node can be found" do
-      node_class = stub 'node', :name => "default", :evaluate_code => nil
-      @compiler.known_resource_types.stubs(:node).with("default").returns(node_class)
-
-      node_resource = stub 'node resource', :ref => "Node[default]", :evaluate => nil, :type => "node"
-      node_class.expects(:ensure_in_catalog).returns(node_resource)
-
-      @compiler.compile
-    end
-
-    it "should evaluate the node resource immediately rather than using lazy evaluation" do
-      node_class = stub 'node', :name => "c"
-      @compiler.known_resource_types.stubs(:node).with("c").returns(node_class)
-
-      node_resource = stub 'node resource', :ref => "Node[c]", :type => "node"
-      node_class.expects(:ensure_in_catalog).returns(node_resource)
-
-      node_resource.expects(:evaluate)
-
-      @compiler.send(:evaluate_ast_node)
-    end
-  end
-
   describe "when evaluating node classes" do
     include PuppetSpec::Compiler
 
-    describe "when provided classes in array format" do
-      let(:node) { Puppet::Node.new('someone', :classes => ['something']) }
-
-      describe "when the class exists" do
-        it "should succeed if the class is already included" do
-          manifest = <<-MANIFEST
-          class something {}
-          include something
-          MANIFEST
-
-          catalog = compile_to_catalog(manifest, node)
-
-          expect(catalog.resource('Class', 'Something')).not_to be_nil
-        end
-
-        it "should evaluate the class without parameters if it's not already included" do
-          manifest = "class something {}"
-
-          catalog = compile_to_catalog(manifest, node)
-
-          expect(catalog.resource('Class', 'Something')).not_to be_nil
-        end
-      end
-
-      it "should fail if the class doesn't exist" do
-        expect { compile_to_catalog('', node) }.to raise_error(Puppet::Error, /Could not find class something/)
-      end
-    end
-
     describe "when provided classes in hash format" do
-      describe "for classes without parameters" do
-        let(:node) { Puppet::Node.new('someone', :classes => {'something' => {}}) }
-
-        describe "when the class exists" do
-          it "should succeed if the class is already included" do
-            manifest = <<-MANIFEST
-            class something {}
-            include something
-            MANIFEST
-
-            catalog = compile_to_catalog(manifest, node)
-
-            expect(catalog.resource('Class', 'Something')).not_to be_nil
-          end
-
-          it "should evaluate the class if it's not already included" do
-            manifest = <<-MANIFEST
-            class something {}
-            MANIFEST
-
-            catalog = compile_to_catalog(manifest, node)
-
-            expect(catalog.resource('Class', 'Something')).not_to be_nil
-          end
-        end
-
-        it "should fail if the class doesn't exist" do
-          expect { compile_to_catalog('', node) }.to raise_error(Puppet::Error, /Could not find class something/)
-        end
-      end
-
-      describe "for classes with parameters" do
-        let(:node) { Puppet::Node.new('someone', :classes => {'something' => {'configuron' => 'defrabulated'}}) }
-
-        describe "when the class exists" do
-          it "should fail if the class is already included" do
-            manifest = <<-MANIFEST
-            class something($configuron=frabulated) {}
-            include something
-            MANIFEST
-
-            expect { compile_to_catalog(manifest, node) }.to raise_error(Puppet::Error, /Class\[Something\] is already declared/)
-          end
-
-          it "should evaluate the class if it's not already included" do
-            manifest = <<-MANIFEST
-            class something($configuron=frabulated) {}
-            MANIFEST
-
-            catalog = compile_to_catalog(manifest, node)
-
-            resource = catalog.resource('Class', 'Something')
-            expect(resource['configuron']).to eq('defrabulated')
-          end
-        end
-
-        it "should fail if the class doesn't exist" do
-          expect { compile_to_catalog('', node) }.to raise_error(Puppet::Error, /Could not find class something/)
-        end
-
-        it 'evaluates classes declared with parameters before unparameterized classes' do
-          node = Puppet::Node.new('someone', :classes => { 'app::web' => {}, 'app' => { 'port' => 8080 } })
-          manifest = <<-MANIFEST
-          class app($port = 80) { }
-
-          class app::web($port = $app::port) inherits app {
-            notify { expected: message => "$port" }
-          }
-          MANIFEST
-
-          catalog = compile_to_catalog(manifest, node)
-
-          expect(catalog).to have_resource("Class[App]").with_parameter(:port, 8080)
-          expect(catalog).to have_resource("Class[App::Web]")
-          expect(catalog).to have_resource("Notify[expected]").with_parameter(:message, "8080")
-        end
-      end
-
       it 'looks up default parameter values from inherited class (PUP-2532)' do
         catalog = compile_to_catalog(<<-CODE)
           class a {
@@ -918,47 +138,6 @@ describe Puppet::Parser::Compiler do
     end
   end
 
-  describe "when managing resource overrides" do
-
-    before do
-      @override = stub 'override', :ref => "File[/foo]", :type => "my"
-      @resource = resource(:file, "/foo")
-    end
-
-    it "should be able to store overrides" do
-      expect { @compiler.add_override(@override) }.not_to raise_error
-    end
-
-    it "should apply overrides to the appropriate resources" do
-      @compiler.add_resource(@scope, @resource)
-      @resource.expects(:merge).with(@override)
-
-      @compiler.add_override(@override)
-
-      @compiler.compile
-    end
-
-    it "should accept overrides before the related resource has been created" do
-      @resource.expects(:merge).with(@override)
-
-      # First store the override
-      @compiler.add_override(@override)
-
-      # Then the resource
-      @compiler.add_resource(@scope, @resource)
-
-      # And compile, so they get resolved
-      @compiler.compile
-    end
-
-    it "should fail if the compile is finished and resource overrides have not been applied" do
-      @compiler.add_override(@override)
-
-      expect { @compiler.compile }.to raise_error Puppet::ParseError, 'Could not find resource(s) File[/foo] for overriding'
-    end
-  end
-
-
   context "when converting catalog to resource" do
     it "the same environment is used for compilation as for transformation to resource form" do
         Puppet[:code] = <<-MANIFEST
@@ -1031,7 +210,7 @@ describe Puppet::Parser::Compiler do
       end
     end
   end
-  describe "the compiler when using future parser and evaluator" do
+  describe "the compiler when using 4.x language constructs" do
     include PuppetSpec::Compiler
 
     if Puppet.features.microsoft_windows?
@@ -1169,15 +348,77 @@ describe Puppet::Parser::Compiler do
       end.to raise_error(/Resource Override can only.*got: Class\[a\].*/)
     end
 
-    describe "when resolving class references" do
+    describe 'when resolving class references' do
       include Matchers::Resource
+
+      { 'string'             => 'myWay',
+        'class reference'    => 'Class["myWay"]',
+        'resource reference' => 'Resource["class", "myWay"]'
+      }.each do |label, code|
+        it "allows camel cased class name reference in 'include' using a #{label}" do
+          catalog = compile_to_catalog(<<-"PP")
+            class myWay {
+              notify { 'I did it': message => 'my way'}
+            }
+            include #{code}
+          PP
+          expect(catalog).to have_resource("Notify[I did it]")
+        end
+      end
+
+      describe 'and classname is a Resource Reference and strict == :error' do
+        before(:each) do
+          Puppet[:strict] = :error
+        end
+
+        it 'is reported as an error' do
+          expect { 
+            compile_to_catalog(<<-PP)
+              notice Class[ToothFairy]
+            PP
+          }.to raise_error(/Illegal Class name in class reference. A TypeReference\['ToothFairy'\]-Type cannot be used where a String is expected/)
+        end
+      end
+
+      describe 'and classname is a Resource Reference and strict == :warning' do
+        before(:each) do
+          Puppet[:strict] = :warning
+        end
+
+        it 'is reported as a deprecation warning' do
+          expect { 
+            compile_to_catalog(<<-PP)
+              notice Class[ToothFairy]
+            PP
+            expect(@logs).to have_matching_log(/Upper cased class-name in a Class\[<class-name>\] is deprecated, class-name should be a lowercase string/)
+
+          }.to_not raise_error()
+        end
+      end
+
+      describe 'and classname is a Resource Reference and strict == :off' do
+        before(:each) do
+          Puppet[:strict] = :off
+        end
+
+        it 'is not reported' do
+          expect { 
+            compile_to_catalog(<<-PP)
+              notice Class[ToothFairy]
+            PP
+            expect(@logs).to_not have_matching_log(/Warning: Upper cased class-name in a Class\[<class-name>\] is deprecated, class-name should be a lowercase string/)
+
+          }.to_not raise_error()
+        end
+      end
+
       it "should not favor local scope (with class included in topscope)" do
         catalog = compile_to_catalog(<<-PP)
           class experiment {
             class baz {
             }
-            notify {"x" : require => Class[Baz] }
-            notify {"y" : require => Class[Experiment::Baz] }
+            notify {"x" : require => Class['baz'] }
+            notify {"y" : require => Class['experiment::baz'] }
           }
           class baz {
           }
@@ -1195,8 +436,8 @@ describe Puppet::Parser::Compiler do
           class experiment {
             class baz {
             }
-            notify {"x" : require => Class[Baz] }
-            notify {"y" : require => Class[Experiment::Baz] }
+            notify {"x" : require => Class['baz'] }
+            notify {"y" : require => Class['experiment::baz'] }
           }
           class baz {
           }
@@ -1691,17 +932,12 @@ describe Puppet::Parser::Compiler do
         expect(catalog).to have_resource("Notify[value second]")
       end
 
-      # Conditinoally left out for Ruby 1.8.x since the Proc created for the expected number of arguments will accept
-      # a call with fewer arguments and then pass all arguments to the closure. The closure then receives an argument
-      # array of correct size with nil values instead of an array with too few arguments
-      unless RUBY_VERSION[0,3] == '1.8'
-        it 'denies when missing required arguments' do
-          expect do
-            compile_to_catalog(<<-MANIFEST)
-              with(1) |$x, $y| { }
-            MANIFEST
-          end.to raise_error(/Parameter \$y is required but no value was given/m)
-        end
+      it 'denies when missing required arguments' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with(1) |$x, $y| { }
+          MANIFEST
+        end.to raise_error(/Parameter \$y is required but no value was given/m)
       end
 
       it 'accepts anything when parameters are untyped' do