puppet 3.8.7-x86-mingw32 → 4.0.0.rc1-x86-mingw32

data/spec/integration/network/formats_spec.rb

@@ -36,11 +36,11 @@ describe Puppet::Network::FormatHandler.format(:s) do
   end
 
   it "should support certificates" do
-    @format.should be_supported(Puppet::SSL::Certificate)
+    expect(@format).to be_supported(Puppet::SSL::Certificate)
   end
 
   it "should not support catalogs" do
-    @format.should_not be_supported(Puppet::Resource::Catalog)
+    expect(@format).not_to be_supported(Puppet::Resource::Catalog)
   end
 end
 
@@ -51,41 +51,41 @@ describe Puppet::Network::FormatHandler.format(:pson) do
 
   it "should be able to render an instance to pson" do
     instance = PsonIntTest.new("foo")
-    PsonIntTest.canonical_order(@pson.render(instance)).should == PsonIntTest.canonical_order('{"type":"PsonIntTest","data":["foo"]}' )
+    expect(PsonIntTest.canonical_order(@pson.render(instance))).to eq(PsonIntTest.canonical_order('{"type":"PsonIntTest","data":["foo"]}' ))
   end
 
   it "should be able to render arrays to pson" do
-    @pson.render([1,2]).should == '[1,2]'
+    expect(@pson.render([1,2])).to eq('[1,2]')
   end
 
   it "should be able to render arrays containing hashes to pson" do
-    @pson.render([{"one"=>1},{"two"=>2}]).should == '[{"one":1},{"two":2}]'
+    expect(@pson.render([{"one"=>1},{"two"=>2}])).to eq('[{"one":1},{"two":2}]')
   end
 
   it "should be able to render multiple instances to pson" do
     one = PsonIntTest.new("one")
     two = PsonIntTest.new("two")
 
-    PsonIntTest.canonical_order(@pson.render([one,two])).should == PsonIntTest.canonical_order('[{"type":"PsonIntTest","data":["one"]},{"type":"PsonIntTest","data":["two"]}]')
+    expect(PsonIntTest.canonical_order(@pson.render([one,two]))).to eq(PsonIntTest.canonical_order('[{"type":"PsonIntTest","data":["one"]},{"type":"PsonIntTest","data":["two"]}]'))
   end
 
   it "should be able to intern pson into an instance" do
-    @pson.intern(PsonIntTest, '{"type":"PsonIntTest","data":["foo"]}').should == PsonIntTest.new("foo")
+    expect(@pson.intern(PsonIntTest, '{"type":"PsonIntTest","data":["foo"]}')).to eq(PsonIntTest.new("foo"))
   end
 
   it "should be able to intern pson with no class information into an instance" do
-    @pson.intern(PsonIntTest, '["foo"]').should == PsonIntTest.new("foo")
+    expect(@pson.intern(PsonIntTest, '["foo"]')).to eq(PsonIntTest.new("foo"))
   end
 
   it "should be able to intern multiple instances from pson" do
-    @pson.intern_multiple(PsonIntTest, '[{"type": "PsonIntTest", "data": ["one"]},{"type": "PsonIntTest", "data": ["two"]}]').should == [
+    expect(@pson.intern_multiple(PsonIntTest, '[{"type": "PsonIntTest", "data": ["one"]},{"type": "PsonIntTest", "data": ["two"]}]')).to eq([
       PsonIntTest.new("one"), PsonIntTest.new("two")
-    ]
+    ])
   end
 
   it "should be able to intern multiple instances from pson with no class information" do
-    @pson.intern_multiple(PsonIntTest, '[["one"],["two"]]').should == [
+    expect(@pson.intern_multiple(PsonIntTest, '[["one"],["two"]]')).to eq([
       PsonIntTest.new("one"), PsonIntTest.new("two")
-    ]
+    ])
   end
 end

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

@@ -0,0 +1,56 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/network/http'
+require 'puppet/network/http/api/indirected_routes'
+require 'puppet/indirector_proxy'
+require 'puppet_spec/files'
+require 'puppet_spec/network'
+require 'json'
+
+describe Puppet::Network::HTTP::API::IndirectedRoutes do
+  include PuppetSpec::Files
+  include PuppetSpec::Network
+  include_context 'with supported checksum types'
+
+  describe "when running the master application" do
+    before :each do
+      Puppet::Application[:master].setup_terminuses
+    end
+
+    describe "using Puppet API to request file metadata" do
+      let(:handler) { Puppet::Network::HTTP::API::IndirectedRoutes.new }
+      let(:response) { Puppet::Network::HTTP::MemoryResponse.new }
+
+      with_checksum_types 'file_content', 'lib/files/file.rb' do
+        before :each do
+          Puppet.settings[:modulepath] = env_path
+        end
+
+        it "should find the file metadata with expected checksum" do
+          request = a_request_that_finds(Puppet::IndirectorProxy.new("modules/lib/file.rb", "file_metadata"),
+                                         {:accept_header => 'unknown, text/pson'},
+                                         {:environment => 'production', :checksum_type => checksum_type})
+          handler.call(request, response)
+          resp = JSON.parse(response.body)
+
+          expect(resp['checksum']['type']).to eq(checksum_type)
+          expect(checksum_valid(checksum_type, checksum, resp['checksum']['value'])).to be_truthy
+        end
+
+        it "should search for the file metadata with expected checksum" do
+          request = a_request_that_searches(Puppet::IndirectorProxy.new("modules/lib", "file_metadata"),
+                                            {:accept_header => 'unknown, text/pson'},
+                                            {:environment => 'production', :checksum_type => checksum_type, :recurse => 'yes'})
+          handler.call(request, response)
+          resp = JSON.parse(response.body)
+
+          expect(resp.length).to eq(2)
+          file = resp.find {|x| x['relative_path'] == 'file.rb'}
+
+          expect(file['checksum']['type']).to eq(checksum_type)
+          expect(checksum_valid(checksum_type, checksum, file['checksum']['value'])).to be_truthy
+        end
+      end
+    end
+  end
+end

data/spec/integration/node/environment_spec.rb

@@ -32,8 +32,8 @@ describe Puppet::Node::Environment do
     environment = Puppet::Node::Environment.create(:foo, dirs)
 
     environment.modules.each do |mod|
-      mod.environment.should == environment
-      mod.path.should == mods[mod.name]
+      expect(mod.environment).to eq(environment)
+      expect(mod.path).to eq(mods[mod.name])
     end
   end
 
@@ -52,8 +52,8 @@ describe Puppet::Node::Environment do
     environment = Puppet::Node::Environment.create(:foo, dirs)
 
     mods = environment.modules
-    mods.length.should == 1
-    mods[0].path.should == File.join(base, "dir1", "mod")
+    expect(mods.length).to eq(1)
+    expect(mods[0].path).to eq(File.join(base, "dir1", "mod"))
   end
 
   shared_examples_for "the environment's initial import" do |settings|
@@ -80,7 +80,7 @@ describe Puppet::Node::Environment do
     end
   end
 
-  shared_examples_for "the environment's initial import in the future" do |settings|
+  shared_examples_for "the environment's initial import in 4x" do |settings|
     it "a manifest referring to a directory invokes recursive parsing of all its files in sorted order" do
       settings.each do |name, value|
         Puppet[name] = value
@@ -104,22 +104,19 @@ describe Puppet::Node::Environment do
     end
   end
 
-  describe 'using classic parser' do
+  describe 'using 4x parser' do
     it_behaves_like "the environment's initial import",
-      :parser => 'current',
       # fixture uses variables that are set in a particular order (this ensures
       # that files are parsed and combined in the right order or an error will
       # be raised if 'b' is evaluated before 'a').
       :strict_variables => true
   end
 
-  describe 'using future parser' do
-    it_behaves_like "the environment's initial import",
-      :parser    => 'future',
-      # Turned off because currently future parser turns on the binder which
-      # causes lookup of facts that are uninitialized and it will fail with
-      # errors for 'osfamily' etc.  This can be turned back on when the binder
-      # is taken out of the equation.
-      :strict_variables => false
+  describe 'using 4x parser' do
+    it_behaves_like "the environment's initial import in 4x",
+      # fixture uses variables that are set in a particular order (this ensures
+      # that files are parsed and combined in the right order or an error will
+      # be raised if 'b' is evaluated before 'a').
+      :strict_variables => true
   end
 end

data/spec/integration/node/facts_spec.rb

@@ -6,7 +6,7 @@ describe Puppet::Node::Facts do
     it "should expire any cached node instances when it is saved" do
       Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
 
-      Puppet::Node::Facts.indirection.terminus(:yaml).should equal(Puppet::Node::Facts.indirection.terminus(:yaml))
+      expect(Puppet::Node::Facts.indirection.terminus(:yaml)).to equal(Puppet::Node::Facts.indirection.terminus(:yaml))
       terminus = Puppet::Node::Facts.indirection.terminus(:yaml)
       terminus.stubs :save
 
@@ -25,7 +25,7 @@ describe Puppet::Node::Facts do
       terminus.expects(:path).with("me").returns "/my/yaml/file"
       Puppet::FileSystem.expects(:exist?).with("/my/yaml/file").returns false
 
-      Puppet::Node::Facts.indirection.find("me").should be_nil
+      expect(Puppet::Node::Facts.indirection.find("me")).to be_nil
     end
 
     it "should be able to delegate to the :facter terminus" do
@@ -35,7 +35,7 @@ describe Puppet::Node::Facts do
       facts = Puppet::Node::Facts.new("me")
       Puppet::Node::Facts.expects(:new).with("me", "facter_hash").returns facts
 
-      Puppet::Node::Facts.indirection.find("me").should equal(facts)
+      expect(Puppet::Node::Facts.indirection.find("me")).to equal(facts)
     end
   end
 end

data/spec/integration/node_spec.rb

@@ -22,11 +22,11 @@ describe Puppet::Node do
       terminus.expects(:path).with(@name).returns "/my/yaml/file"
 
       Puppet::FileSystem.expects(:exist?).with("/my/yaml/file").returns false
-      Puppet::Node.indirection.find(@name).should be_nil
+      expect(Puppet::Node.indirection.find(@name)).to be_nil
     end
 
     it "should have an ldap terminus" do
-      Puppet::Node.indirection.terminus(:ldap).should_not be_nil
+      expect(Puppet::Node.indirection.terminus(:ldap)).not_to be_nil
     end
 
     it "should be able to use the plain terminus" do
@@ -37,7 +37,7 @@ describe Puppet::Node do
 
       Puppet::Node.expects(:new).with(@name).returns @node
 
-      Puppet::Node.indirection.find(@name).should equal(@node)
+      expect(Puppet::Node.indirection.find(@name)).to equal(@node)
     end
 
     describe "and using the memory terminus" do
@@ -53,29 +53,29 @@ describe Puppet::Node do
       end
 
       it "should find no nodes by default" do
-        Puppet::Node.indirection.find(@name).should be_nil
+        expect(Puppet::Node.indirection.find(@name)).to be_nil
       end
 
       it "should be able to find nodes that were previously saved" do
         Puppet::Node.indirection.save(@node)
-        Puppet::Node.indirection.find(@name).should equal(@node)
+        expect(Puppet::Node.indirection.find(@name)).to equal(@node)
       end
 
       it "should replace existing saved nodes when a new node with the same name is saved" do
         Puppet::Node.indirection.save(@node)
         two = Puppet::Node.new(@name)
         Puppet::Node.indirection.save(two)
-        Puppet::Node.indirection.find(@name).should equal(two)
+        expect(Puppet::Node.indirection.find(@name)).to equal(two)
       end
 
       it "should be able to remove previously saved nodes" do
         Puppet::Node.indirection.save(@node)
         Puppet::Node.indirection.destroy(@node.name)
-        Puppet::Node.indirection.find(@name).should be_nil
+        expect(Puppet::Node.indirection.find(@name)).to be_nil
       end
 
       it "should fail when asked to destroy a node that does not exist" do
-        proc { Puppet::Node.indirection.destroy(@node) }.should raise_error(ArgumentError)
+        expect { Puppet::Node.indirection.destroy(@node) }.to raise_error(ArgumentError)
       end
     end
   end

data/spec/integration/parser/catalog_spec.rb

@@ -6,7 +6,7 @@ require 'puppet/indirector/catalog/compiler'
 describe "A catalog" do
   include PuppetSpec::Compiler
 
-  shared_examples_for "when compiled" do
+  context "when compiled" do
     context "when transmitted to the agent" do
 
       it "preserves the order in which the resources are added to the catalog" do
@@ -77,37 +77,6 @@ describe "A catalog" do
     end
   end
 
-  describe 'using classic parser' do
-    before :each do
-      Puppet[:parser] = 'current'
-    end
-    it_behaves_like 'when compiled' do
-    end
-
-    it "compiles resource creation from appended array as two separate resources" do
-      # moved here from acceptance test "jeff_append_to_array.rb"
-      master_catalog = master_catalog_for(<<-EOM)
-        class parent {
-          $arr1 = [ "parent array element" ]
-        }
-        class parent::child inherits parent {
-          $arr1 += ["child array element"]
-          notify { $arr1: }
-        }
-        include parent::child
-      EOM
-      expect(resources_in(master_catalog)).to include('Notify[parent array element]', 'Notify[child array element]')
-    end
-  end
-
-  describe 'using future parser' do
-    before :each do
-      Puppet[:parser] = 'future'
-    end
-    it_behaves_like 'when compiled' do
-    end
-  end
-
   def master_catalog_for(manifest)
     master_catalog = Puppet::Resource::Catalog::Compiler.new.filter(compile_to_catalog(manifest))
   end

data/spec/integration/parser/class_spec.rb

@@ -4,10 +4,6 @@ require 'puppet_spec/language'
 describe "Class expressions" do
   extend PuppetSpec::Language
 
-  before :each do
-    Puppet[:parser] = 'future'
-  end
-
   produces(
     "class hi { }"                                       => '!defined(Class[Hi])',
 

data/spec/integration/parser/{collector_spec.rb → collection_spec.rb}

@@ -2,19 +2,17 @@
 require 'spec_helper'
 require 'puppet_spec/compiler'
 
-require 'puppet/parser/collector'
-
-describe Puppet::Parser::Collector do
+describe 'collectors' do
   include PuppetSpec::Compiler
 
   def expect_the_message_to_be(expected_messages, code, node = Puppet::Node.new('the node'))
     catalog = compile_to_catalog(code, node)
     messages = catalog.resources.find_all { |resource| resource.type == 'Notify' }.
                                  collect { |notify| notify[:message] }
-    messages.should include(*expected_messages)
+    expect(messages).to include(*expected_messages)
   end
 
-  shared_examples_for "virtual resource collection" do
+  context "virtual resource collection" do
     it "matches everything when no query given" do
       expect_the_message_to_be(["the other message", "the message"], <<-MANIFEST)
         @notify { "testing": message => "the message" }
@@ -299,26 +297,4 @@ describe Puppet::Parser::Collector do
     end
   end
 
-  describe "in the current parser" do
-    before :each do
-      Puppet[:parser] = 'current'
-    end
-
-    it_behaves_like "virtual resource collection"
-  end
-
-  describe "in the future parser" do
-    before :each do
-      Puppet[:parser] = 'future'
-    end
-
-    it_behaves_like "virtual resource collection"
-
-    it "collects and overrides attributes specified with a * => hash" do
-      expect_the_message_to_be(["overridden1"], <<-MANIFEST)
-        notify { "testing": message => "original" }
-        Notify <|  |> { * => { message => 'overridden1' }}
-      MANIFEST
-    end
-  end
 end

data/spec/integration/parser/compiler_spec.rb

@@ -1,527 +1,911 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
-require 'puppet/parser/parser_factory'
 require 'puppet_spec/compiler'
 require 'matchers/resource'
 
-describe "Puppet::Parser::Compiler" do
-  include PuppetSpec::Compiler
+class CompilerTestResource
+  attr_accessor :builtin, :virtual, :evaluated, :type, :title
+
+  def initialize(type, title)
+    @type = type
+    @title = title
+  end
+
+  def [](attr)
+    return nil if attr == :stage
+    :main
+  end
+
+  def ref
+    "#{type.to_s.capitalize}[#{title}]"
+  end
+
+  def evaluated?
+    @evaluated
+  end
+
+  def builtin_type?
+    @builtin
+  end
+
+  def virtual?
+    @virtual
+  end
+
+  def class?
+    false
+  end
+
+  def stage?
+    false
+  end
+
+  def evaluate
+  end
+
+  def file
+    "/fake/file/goes/here"
+  end
+
+  def line
+    "42"
+  end
+end
+
+describe Puppet::Parser::Compiler do
+  include PuppetSpec::Files
   include Matchers::Resource
 
+  def resource(type, title)
+    Puppet::Parser::Resource.new(type, title, :scope => @scope)
+  end
+
+  let(:environment) { Puppet::Node::Environment.create(:testing, []) }
+
   before :each do
-    @node = Puppet::Node.new "testnode"
+    # Push me faster, I wanna go back in time!  (Specifically, freeze time
+    # across the test since we have a bunch of version == timestamp code
+    # hidden away in the implementation and we keep losing the race.)
+    # --daniel 2011-04-21
+    now = Time.now
+    Time.stubs(:now).returns(now)
+
+    @node = Puppet::Node.new("testnode",
+                             :facts => Puppet::Node::Facts.new("facts", {}),
+                             :environment => environment)
+    @known_resource_types = environment.known_resource_types
+    @compiler = Puppet::Parser::Compiler.new(@node)
+    @scope = Puppet::Parser::Scope.new(@compiler, :source => stub('source'))
+    @scope_resource = Puppet::Parser::Resource.new(:file, "/my/file", :scope => @scope)
+    @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
 
-    @scope_resource = stub 'scope_resource', :builtin? => true, :finish => nil, :ref => 'Class[main]'
-    @scope = stub 'scope', :resource => @scope_resource, :source => mock("source")
+  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 determine the configuration version from a local version control repository" do
-    pending("Bug #14071 about semantics of Puppet::Util::Execute on Windows", :if => Puppet.features.microsoft_windows?) do
-      # This should always work, because we should always be
-      # in the puppet repo when we run this.
-      version = %x{git rev-parse HEAD}.chomp
+  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
 
-      Puppet.settings[:config_version] = 'git rev-parse HEAD'
+  describe "when initializing" do
 
-      @parser = Puppet::Parser::ParserFactory.parser "development"
-      @compiler = Puppet::Parser::Compiler.new(@node)
+    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
 
-      @compiler.catalog.version.should == version
+    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
 
-  it "should not create duplicate resources when a class is referenced both directly and indirectly by the node classifier (4792)" do
-    Puppet[:code] = <<-PP
-      class foo
-      {
-        notify { foo_notify: }
-        include bar
-      }
-      class bar
-      {
-        notify { bar_notify: }
-      }
-    PP
+  describe "when managing scopes" do
 
-    @node.stubs(:classes).returns(['foo', 'bar'])
+    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)
 
-    catalog = Puppet::Parser::Compiler.compile(@node)
+      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)
 
-    catalog.resource("Notify[foo_notify]").should_not be_nil
-    catalog.resource("Notify[bar_notify]").should_not be_nil
+      expect(newscope.parent).to equal(@compiler.topscope)
+    end
   end
 
-  describe "when resolving class references" do
-    it "should favor local scope, even if there's an included class in topscope" do
-      Puppet[:code] = <<-PP
-        class experiment {
-          class baz {
-          }
-          notify {"x" : require => Class[Baz] }
-        }
-        class baz {
-        }
-        include baz
-        include experiment
-        include experiment::baz
-      PP
+  describe "when compiling" do
 
-      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+    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
 
-      notify_resource = catalog.resource( "Notify[x]" )
+    # 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
 
-      notify_resource[:require].title.should == "Experiment::Baz"
+    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 favor local scope, even if there's an unincluded class in topscope" do
-      Puppet[:code] = <<-PP
-        class experiment {
-          class baz {
-          }
-          notify {"x" : require => Class[Baz] }
-        }
-        class baz {
-        }
-        include experiment
-        include experiment::baz
-      PP
+    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
 
-      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+    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)
 
-      notify_resource = catalog.resource( "Notify[x]" )
+      @compiler.compile
+    end
 
-      notify_resource[:require].title.should == "Experiment::Baz"
+    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
-  end
-  describe "(ticket #13349) when explicitly specifying top scope" do
-    ["class {'::bar::baz':}", "include ::bar::baz"].each do |include|
-      describe "with #{include}" do
-        it "should find the top level class" do
-          Puppet[:code] = <<-MANIFEST
-            class { 'foo::test': }
-            class foo::test {
-            	#{include}
-            }
-            class bar::baz {
-            	notify { 'good!': }
-            }
-            class foo::bar::baz {
-            	notify { 'bad!': }
-            }
-          MANIFEST
 
-          catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+    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)
 
-          catalog.resource("Class[Bar::Baz]").should_not be_nil
-          catalog.resource("Notify[good!]").should_not be_nil
-          catalog.resource("Class[Foo::Bar::Baz]").should be_nil
-          catalog.resource("Notify[bad!]").should be_nil
-        end
-      end
+      expect(@compiler.catalog.edge?(stage, klass)).to be_truthy
     end
-  end
 
-  it 'should recompute the version after input files are re-parsed' do
-    Puppet[:code] = 'class foo { }'
-    first_time = Time.at(1)
-    second_time = Time.at(200)
-    Time.stubs(:now).returns(first_time)
-    node = Puppet::Node.new('mynode')
-    expect(Puppet::Parser::Compiler.compile(node).version).to eq(first_time.to_i)
-    Time.stubs(:now).returns(second_time)
-    expect(Puppet::Parser::Compiler.compile(node).version).to eq(first_time.to_i) # no change because files didn't change
-    Puppet[:code] = nil
-    expect(Puppet::Parser::Compiler.compile(node).version).to eq(second_time.to_i)
-  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) }
 
-  ['class', 'define', 'node'].each do |thing|
-    it "should not allow '#{thing}' inside evaluated conditional constructs" do
-      Puppet[:code] = <<-PP
-        if true {
-          #{thing} foo {
-          }
-          notify { decoy: }
-        }
-      PP
-
-      begin
-        Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
-        raise "compilation should have raised Puppet::Error"
-      rescue Puppet::Error => e
-        e.message.should =~ /at line 2/
-      end
+      @compiler.add_collection(colls[0])
+      @compiler.add_collection(colls[1])
+
+      compile_stub(:evaluate_generators)
+      @compiler.compile
     end
-  end
 
-  it "should not allow classes inside unevaluated conditional constructs" do
-    Puppet[:code] = <<-PP
-      if false {
-        class foo {
-        }
-      }
-    PP
+    it "should ignore builtin resources" do
+      resource = resource(:file, "testing")
 
-    lambda { Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode")) }.should raise_error(Puppet::Error)
-  end
+      @compiler.add_resource(@scope, resource)
+      resource.expects(:evaluate).never
 
-  describe "when defining relationships" do
-    def extract_name(ref)
-      ref.sub(/File\[(\w+)\]/, '\1')
+      @compiler.compile
     end
 
-    let(:node) { Puppet::Node.new('mynode') }
-    let(:code) do
-      <<-MANIFEST
-        file { [a,b,c]:
-          mode => '0644',
-        }
-        file { [d,e]:
-          mode => '0755',
-        }
-      MANIFEST
+    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
-    let(:expected_relationships) { [] }
-    let(:expected_subscriptions) { [] }
 
-    before :each do
-      Puppet[:code] = code
+    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
 
-    after :each do
-      catalog = Puppet::Parser::Compiler.compile(node)
+    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")
 
-      resources = catalog.resources.select { |res| res.type == 'File' }
+      # 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 }
 
-      actual_relationships, actual_subscriptions = [:before, :notify].map do |relation|
-        resources.map do |res|
-          dependents = Array(res[relation])
-          dependents.map { |ref| [res.title, extract_name(ref)] }
-        end.inject(&:concat)
+
+      @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
 
-      actual_relationships.should =~ expected_relationships
-      actual_subscriptions.should =~ expected_subscriptions
+      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 create a relationship" do
-      code << "File[a] -> File[b]"
+    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)
 
-      expected_relationships << ['a','b']
+      expect(@compiler.resources).to eq([resource1, resource2])
     end
 
-    it "should create a subscription" do
-      code << "File[a] ~> File[b]"
+    it "should add resources that do not conflict with existing resources" do
+      resource = resource(:file, "yay")
+      @compiler.add_resource(@scope, resource)
 
-      expected_subscriptions << ['a', 'b']
+      expect(@compiler.catalog).to be_vertex(resource)
     end
 
-    it "should create relationships using title arrays" do
-      code << "File[a,b] -> File[c,d]"
+    it "should fail to add resources that conflict with existing resources" do
+      path = make_absolute("/foo")
+      file1 = resource(:file, path)
+      file2 = resource(:file, path)
 
-      expected_relationships.concat [
-        ['a', 'c'],
-        ['b', 'c'],
-        ['a', 'd'],
-        ['b', 'd'],
-      ]
+      @compiler.add_resource(@scope, file1)
+      expect { @compiler.add_resource(@scope, file2) }.to raise_error(Puppet::Resource::Catalog::DuplicateResourceError)
     end
 
-    it "should create relationships using collection expressions" do
-      code << "File <| mode == 0644 |> -> File <| mode == 0755 |>"
+    it "should add an edge from the scope resource to the added resource" do
+      resource = resource(:file, "yay")
+      @compiler.add_resource(@scope, resource)
 
-      expected_relationships.concat [
-        ['a', 'd'],
-        ['b', 'd'],
-        ['c', 'd'],
-        ['a', 'e'],
-        ['b', 'e'],
-        ['c', 'e'],
-      ]
+      expect(@compiler.catalog).to be_edge(@scope.resource, resource)
     end
 
-    it "should create relationships using resource names" do
-      code << "'File[a]' -> 'File[b]'"
+    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)
 
-      expected_relationships << ['a', 'b']
+      expect(@compiler.catalog).not_to be_edge(main, resource)
     end
 
-    it "should create relationships using variables" do
-      code << <<-MANIFEST
-        $var = File[a]
-        $var -> File[b]
-      MANIFEST
+    it "should not add any parent-edges to stages" do
+      stage = resource(:stage, "other")
+      @compiler.add_resource(@scope, stage)
 
-      expected_relationships << ['a', 'b']
+      @scope.resource = resource(:class, "foo")
+
+      expect(@compiler.catalog.edge?(@scope.resource, stage)).to be_falsey
     end
 
-    it "should create relationships using case statements" do
-      code << <<-MANIFEST
-        $var = 10
-        case $var {
-          10: {
-            file { s1: }
-          }
-          12: {
-            file { s2: }
-          }
-        }
-        ->
-        case $var + 2 {
-          10: {
-            file { t1: }
-          }
-          12: {
-            file { t2: }
-          }
-        }
-      MANIFEST
+    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
 
-      expected_relationships << ['s1', 't2']
+      @compiler.compile
     end
+  end
+
+  describe "when evaluating collections" do
+
+    it "should evaluate each collection" do
+      2.times { |i|
+        coll = mock 'coll%s' % i
+        @compiler.add_collection(coll)
 
-    it "should create relationships using array members" do
-      code << <<-MANIFEST
-        $var = [ [ [ File[a], File[b] ] ] ]
-        $var[0][0][0] -> $var[0][0][1]
-      MANIFEST
+        # 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
+      }
 
-      expected_relationships << ['a', 'b']
+      @compiler.compile
     end
 
-    it "should create relationships using hash members" do
-      code << <<-MANIFEST
-        $var = {'foo' => {'bar' => {'source' => File[a], 'target' => File[b]}}}
-        $var[foo][bar][source] -> $var[foo][bar][target]
-      MANIFEST
+    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)
 
-      expected_relationships << ['a', 'b']
+      @compiler.add_collection(coll)
+
+      expect { @compiler.compile }.not_to raise_error
     end
 
-    it "should create relationships using resource declarations" do
-      code << "file { l: } -> file { r: }"
+    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)
 
-      expected_relationships << ['l', 'r']
+      expect { @compiler.compile }.to raise_error(Puppet::ParseError, 'Failed to realize virtual resources something')
     end
 
-    it "should chain relationships" do
-      code << "File[a] -> File[b] ~> File[c] <- File[d] <~ File[e]"
+    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])
 
-      expected_relationships << ['a', 'b'] << ['d', 'c']
-      expected_subscriptions << ['b', 'c'] << ['e', 'd']
+      @compiler.add_collection(coll)
+
+      expect { @compiler.compile }.to raise_error(Puppet::ParseError, 'Failed to realize virtual resources one, two')
     end
   end
 
-  context 'when working with immutable node data' do
-    context 'and have opted in to immutable_node_data' do
-      before :each do
-        Puppet[:immutable_node_data] = true
+  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)
 
-      def node_with_facts(facts)
-        Puppet[:facts_terminus] = :memory
-        Puppet::Node::Facts.indirection.save(Puppet::Node::Facts.new("testing", facts))
-        node = Puppet::Node.new("testing")
-        node.fact_merge
-        node
+      @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
 
-      matcher :fail_compile_with do |node, message_regex|
-        match do |manifest|
-          @error = nil
-          begin
-            PuppetSpec::Compiler.compile_to_catalog(manifest, node)
-            false
-          rescue Puppet::Error => e
-            @error = e
-            message_regex.match(e.message)
-          end
-        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
 
-        failure_message_for_should do
-          if @error
-            "failed with #{@error}\n#{@error.backtrace}"
-          else
-            "did not fail"
-          end
-        end
+      def compile
+        @catalog = @compiler.compile
       end
 
-      it 'should make $facts available' do
-        node = node_with_facts('the_facts' => 'straight')
+      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
 
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-         notify { 'test': message => $facts[the_facts] }
-        MANIFEST
+      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
 
-        catalog.resource("Notify[test]")[:message].should == "straight"
+      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 make $facts reserved' do
-        node = node_with_facts('the_facts' => 'straight')
+      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
 
-        expect('$facts = {}').to fail_compile_with(node, /assign to a reserved variable name: 'facts'/)
-        expect('class a { $facts = {} } include a').to fail_compile_with(node, /assign to a reserved variable name: 'facts'/)
+      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 make $facts immutable' do
-        node = node_with_facts('string' => 'value', 'array' => ['string'], 'hash' => { 'a' => 'string' }, 'number' => 1, 'boolean' => true)
+    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::ParseError, "Must pass b to Class[Foo]")
+    end
 
-        expect('$i=inline_template("<% @facts[%q{new}] = 2 %>")').to fail_compile_with(node, /frozen Hash/i)
-        expect('$i=inline_template("<% @facts[%q{string}].chop! %>")').to fail_compile_with(node, /frozen String/i)
+    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::ParseError, "Invalid parameter: '3' on Class[Foo]")
+    end
 
-        expect('$i=inline_template("<% @facts[%q{array}][0].chop! %>")').to fail_compile_with(node, /frozen String/i)
-        expect('$i=inline_template("<% @facts[%q{array}][1] = 2 %>")').to fail_compile_with(node, /frozen Array/i)
+    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
 
-        expect('$i=inline_template("<% @facts[%q{hash}][%q{a}].chop! %>")').to fail_compile_with(node, /frozen String/i)
-        expect('$i=inline_template("<% @facts[%q{hash}][%q{b}] = 2 %>")').to fail_compile_with(node, /frozen Hash/i)
-      end
+    it "should not evaluate the resources created for found classes unless asked" do
+      @compiler.catalog.stubs(:tag)
 
-      it 'should make $facts available even if there are no facts' do
-        Puppet[:facts_terminus] = :memory
-        node = Puppet::Node.new("testing2")
-        node.fact_merge
+      @resource.expects(:evaluate).never
 
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'test': message => $facts }
-        MANIFEST
+      @class.expects(:ensure_in_catalog).returns(@resource)
+      @scope.stubs(:class_scope).with(@class)
 
-        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, {})
-      end
+      @compiler.evaluate_classes(%w{myclass}, @scope)
     end
 
-    context 'and have not opted in to immutable_node_data' do
-      before :each do
-        Puppet[:immutable_node_data] = false
-      end
+    it "should immediately evaluate the resources created for found classes when asked" do
+      @compiler.catalog.stubs(:tag)
 
-      it 'should not make $facts available' do
-       Puppet[:facts_terminus] = :memory
-       facts = Puppet::Node::Facts.new("testing", 'the_facts' => 'straight')
-       Puppet::Node::Facts.indirection.save(facts)
-       node = Puppet::Node.new("testing")
-       node.fact_merge
+      @resource.expects(:evaluate)
+      @class.expects(:ensure_in_catalog).returns(@resource)
+      @scope.stubs(:class_scope).with(@class)
 
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'test': message => "An $facts space" }
-        MANIFEST
+      @compiler.evaluate_classes(%w{myclass}, @scope, false)
+    end
 
-        catalog.resource("Notify[test]")[:message].should == "An  space"
-      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
 
-  context 'when working with the trusted data hash' do
-    context 'and have opted in to trusted_node_data' do
-      before :each do
-        Puppet[:trusted_node_data] = true
-      end
+  describe "when evaluating AST nodes with no AST nodes present" do
 
-      it 'should make $trusted available' do
-        node = Puppet::Node.new("testing")
-        node.trusted_data = { "data" => "value" }
+    it "should do nothing" do
+      @compiler.expects(:ast_nodes?).returns(false)
+      @compiler.known_resource_types.expects(:nodes).never
+      Puppet::Parser::Resource.expects(:new).never
 
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'test': message => $trusted[data] }
-        MANIFEST
+      @compiler.send(:evaluate_ast_node)
+    end
+  end
 
-        catalog.resource("Notify[test]")[:message].should == "value"
-      end
+  describe "when evaluating AST nodes with AST nodes present" do
 
-      it 'should not allow assignment to $trusted' do
-        node = Puppet::Node.new("testing")
-        node.trusted_data = { "data" => "value" }
+    before do
+      @compiler.known_resource_types.stubs(:nodes?).returns true
 
-        expect do
-          catalog = compile_to_catalog(<<-MANIFEST, node)
-            $trusted = 'changed'
-            notify { 'test': message => $trusted == 'changed' }
-          MANIFEST
-          catalog.resource("Notify[test]")[:message].should == true
-        end.to raise_error(Puppet::Error, /Attempt to assign to a reserved variable name: 'trusted'/)
-      end
+      # 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 not allow addition to $trusted hash' do
-        node = Puppet::Node.new("testing")
-        node.trusted_data = { "data" => "value" }
+      # It should check this last, of course.
+      @compiler.known_resource_types.stubs(:node).with("default").returns(nil)
+    end
 
-        expect do
-          catalog = compile_to_catalog(<<-MANIFEST, node)
-            $trusted['extra'] = 'added'
-            notify { 'test': message => $trusted['extra'] == 'added' }
-          MANIFEST
-          catalog.resource("Notify[test]")[:message].should == true
-          # different errors depending on regular or future parser
-        end.to raise_error(Puppet::Error, /(can't modify frozen [hH]ash)|(Illegal attempt to assign)/)
-      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 not allow addition to $trusted hash via Ruby inline template' do
-        node = Puppet::Node.new("testing")
-        node.trusted_data = { "data" => "value" }
+    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)
 
-        expect do
-          catalog = compile_to_catalog(<<-MANIFEST, node)
-          $dummy = inline_template("<% @trusted['extra'] = 'added' %> lol")
-            notify { 'test': message => $trusted['extra'] == 'added' }
+      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.resource("Notify[test]")[:message].should == true
-        end.to raise_error(Puppet::Error, /can't modify frozen [hH]ash/)
+
+          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
-    end
 
-    context 'and have not opted in to trusted_node_data' do
-      before :each do
-        Puppet[:trusted_node_data] = false
+      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
 
-      it 'should not make $trusted available' do
-        node = Puppet::Node.new("testing")
-        node.trusted_data = { "data" => "value" }
+    describe "when provided classes in hash format" do
+      describe "for classes without parameters" do
+        let(:node) { Puppet::Node.new('someone', :classes => {'something' => {}}) }
 
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'test': message => $trusted == undef }
-        MANIFEST
+        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
 
-        catalog.resource("Notify[test]")[:message].should == true
+          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
 
-      it 'should allow assignment to $trusted' do
-        node = Puppet::Node.new("testing")
+      describe "for classes with parameters" do
+        let(:node) { Puppet::Node.new('someone', :classes => {'something' => {'configuron' => 'defrabulated'}}) }
 
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          $trusted = 'changed'
-          notify { 'test': message => $trusted == 'changed' }
-        MANIFEST
+        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.resource("Notify[test]")[:message].should == true
+          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
     end
   end
 
-  context 'when evaluating collection' do
-    it 'matches on container inherited tags' do
-      Puppet[:code] = <<-MANIFEST
-      class xport_test {
-        tag 'foo_bar'
-        @notify { 'nbr1':
-          message => 'explicitly tagged',
-          tag => 'foo_bar'
-        }
-
-        @notify { 'nbr2':
-          message => 'implicitly tagged'
-        }
-
-        Notify <| tag == 'foo_bar' |> {
-          message => 'overridden'
-        }
-      }
-      include xport_test
-      MANIFEST
+  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
 
-      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+    it "should fail if the compile is finished and resource overrides have not been applied" do
+      @compiler.add_override(@override)
 
-      expect(catalog).to have_resource("Notify[nbr1]").with_parameter(:message, 'overridden')
-      expect(catalog).to have_resource("Notify[nbr2]").with_parameter(:message, 'overridden')
+      expect { @compiler.compile }.to raise_error Puppet::ParseError, 'Could not find resource(s) File[/foo] for overriding'
     end
   end