Successfully modified all tests and code so that all language tests pass again. This is the majority of the work necessary to make the separate "configuration" object work.

2 files changed, 3 insertions, 3 deletions

diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index 34aeca00a..9e90bbdd6 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -73,6 +73,8 @@ module PuppetTest::ParserTesting
         unless config.topscope.source
             raise "Could not find source for scope"
         end
+        # Make the 'main' stuff
+        config.send(:evaluate_main)
         config.topscope
     end
 
@@ -404,5 +406,3 @@ module PuppetTest::ParserTesting
         return trans
     end
 end
-
-# $Id$
diff --git a/test/lib/puppettest/resourcetesting.rb b/test/lib/puppettest/resourcetesting.rb
index e2176d5ef..54154d504 100644
--- a/test/lib/puppettest/resourcetesting.rb
+++ b/test/lib/puppettest/resourcetesting.rb
@@ -28,7 +28,7 @@ module PuppetTest::ResourceTesting
 
     def mkresource(args = {})
         args[:source] ||= "source"
-        args[:scope] ||= stub :tags => []
+        args[:scope] ||= mkscope
 
         {:type => "resource", :title => "testing",
             :source => "source", :scope => "scope"}.each do |param, value|