Flipped the switch so that compiles now return a Configuration instance instead of pre-extracting the configuration.

2 files changed, 1 insertions, 16 deletions

diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index 9e90bbdd6..b8fd8bd83 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -316,7 +316,7 @@ module PuppetTest::ParserTesting
 
         comp = nil
         assert_nothing_raised {
-            comp = config.to_type
+            comp = config.extract.to_type
         }
 
         assert_apply(comp)
diff --git a/test/lib/puppettest/resourcetesting.rb b/test/lib/puppettest/resourcetesting.rb
index 54154d504..325602c22 100644
--- a/test/lib/puppettest/resourcetesting.rb
+++ b/test/lib/puppettest/resourcetesting.rb
@@ -1,21 +1,6 @@
 module PuppetTest::ResourceTesting
     Parser = Puppet::Parser
     AST = Puppet::Parser::AST
-    def mkclassframing(parser = nil)
-        parser ||= mkparser
-
-        parser.newdefine("resource", :arguments => [%w{one}, %w{two value}, %w{three}])
-        parser.newclass("")
-        source = parser.newclass("base")
-        parser.newclass("sub1", :parent => "base")
-        parser.newclass("sub2", :parent => "base")
-        parser.newclass("other")
-
-        config = mkconfig(:parser => parser)
-        config.topscope.source = source
-
-        return parser, config.topscope, source
-    end
 
     def mkevaltest(parser = nil)
         parser ||= mkparser