(CONT-237) - Remove scope method

Author: chelnak

lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb

@@ -7,34 +7,6 @@
 # PuppetInternals provides a set of methods that interface
 # with internal puppet implementations.
 module PuppetlabsSpec::PuppetInternals
-  # parser_scope is intended to return a Puppet::Parser::Scope
-  # instance suitable for placing in a test harness with the intent of
-  # testing parser functions from modules.
-  def scope(parts = {})
-    RSpec.deprecate('scope', replacement: 'rspec-puppet 2.2.0 provides a scope property')
-
-    if %r{^2\.[67]}.match?(Puppet.version)
-      # loadall should only be necessary prior to 3.x
-      # Please note, loadall needs to happen first when creating a scope, otherwise
-      # you might receive undefined method `function_*' errors
-      Puppet::Parser::Functions.autoloader.loadall
-    end
-
-    scope_compiler = parts[:compiler] || compiler
-    scope_parent = parts[:parent] || scope_compiler.topscope
-
-    scope = if %r{^2\.[67]}.match?(Puppet.version)
-              Puppet::Parser::Scope.new(compiler: scope_compiler)
-            else
-              Puppet::Parser::Scope.new(scope_compiler)
-            end
-
-    scope.source = Puppet::Resource::Type.new(:node, 'foo')
-    scope.parent = scope_parent
-    scope
-  end
-  module_function :scope
-
   def resource(parts = {})
     resource_type = parts[:type] || :hostclass
     resource_name = parts[:name] || 'testing'
@@ -51,11 +23,7 @@ def compiler(parts = {})
   def node(parts = {})
     node_name = parts[:name] || 'testinghost'
     options = parts[:options] || {}
-    node_environment = if Puppet.version.to_f >= 4.0
-                         Puppet::Node::Environment.create(parts[:environment] || 'test', [])
-                       else
-                         Puppet::Node::Environment.new(parts[:environment] || 'test')
-                       end
+    node_environment = Puppet::Node::Environment.create(parts[:environment] || 'test', [])
     options[:environment] = node_environment
     Puppet::Node.new(node_name, options)
   end

spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb

@@ -1,35 +1,13 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'rspec-puppet'
 
 describe PuppetlabsSpec::PuppetInternals do
   before(:all) do # this is only needed once # rubocop:disable RSpec/BeforeAfterAll
     Puppet.initialize_settings
   end
 
-  describe '.scope' do
-    subject(:scope) { described_class.scope }
-
-    it 'returns a Puppet::Parser::Scope instance' do
-      expect(scope).to be_a_kind_of Puppet::Parser::Scope
-    end
-
-    it 'is suitable for function testing' do
-      expect(scope.function_inline_template(['foo'])).to eq('foo')
-    end
-
-    it 'accepts a compiler' do
-      compiler = described_class.compiler
-      scope = described_class.scope(compiler: compiler)
-      expect(scope.compiler).to eq(compiler)
-    end
-
-    it 'has a source set' do
-      expect(scope.source).not_to be_nil
-      expect(scope.source.name).to eq('foo')
-    end
-  end
-
   describe '.resource' do
     subject(:resource) { described_class.resource }
 
@@ -78,17 +56,15 @@
     end
   end
 
-  describe '.function_method' do
+  describe '.function_method', type: :puppet_function do
     it 'accepts an injected scope' do
       expect(Puppet::Parser::Functions).to receive(:function).with('my_func').and_return(true)
-      scope = instance_double(described_class.scope.to_s)
       expect(scope).to receive(:method).with(:function_my_func).and_return(:fake_method)
       expect(described_class.function_method('my_func', scope: scope)).to eq(:fake_method)
     end
 
     it "returns nil if the function doesn't exist" do
       expect(Puppet::Parser::Functions).to receive(:function).with('my_func').and_return(false)
-      scope = instance_double(described_class.scope.to_s)
       expect(described_class.function_method('my_func', scope: scope)).to be_nil
     end
   end