Resolving conflicts with ???

5 files changed, 2 insertions, 6 deletions

diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb
index 1a18b4e97..9baf1983e 100644
--- a/lib/puppet/resource/type.rb
+++ b/lib/puppet/resource/type.rb
@@ -27,7 +27,6 @@ class Puppet::Resource::Type
     def evaluate_code(resource)
         # Create a new scope.
         scope = subscope(resource.scope, resource)
-        scope.compiler.class_set(name, scope)
 
         set_resource_parameters(resource, scope)
 
diff --git a/spec/unit/resource/type.rb b/spec/unit/resource/type.rb
index 14503b7cc..98b38c9b1 100755
--- a/spec/unit/resource/type.rb
+++ b/spec/unit/resource/type.rb
@@ -343,11 +343,11 @@ describe Puppet::Resource::Type do
         end
 
         it "should store the class scope" do
-            subscope = stub 'subscope', :compiler => @compiler
+            subscope = stub 'subscope'
+            subscope.expects(:class_set).with('foo',subscope)
             @type.expects(:subscope).with(@scope, @resource).returns subscope
 
             @type.evaluate_code(@resource)
-            @compiler.class_scope(@type).should equal(subscope)
         end
 
         it "should evaluate the code if any is provided" do
diff --git a/test/language/ast.rb b/test/language/ast.rb
index ed11bc16d..209bc9863 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -3,7 +3,6 @@
 require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
-require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppettest/resourcetesting'
 require 'puppettest/parsertesting'
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index bfd0e539c..bd0d34872 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -3,7 +3,6 @@
 require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
-require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/network/client'
 require 'puppet/network/handler'
diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index c3b48b90e..7f4b3662a 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -4,7 +4,6 @@ require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/rails'
-require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/network/client'
 require 'puppettest'