Merge pull request #162 from glennsarti/ticket/stable/MODULES-3240-fix-rspec-puppet-issue

(MODULES-3240) Fix rspec-puppet incompatibility

Author: ferventcoder

spec/functions/functions_shared_examples.rb

@@ -2,7 +2,6 @@
 require 'rspec'
 
 RSpec.shared_context 'scope' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 end
 
 RSpec.shared_examples 'compile' do

spec/functions/sqlserver_is_domain_user_spec.rb

@@ -2,7 +2,6 @@
 
 RSpec.describe 'sqlserver_is_domain_or_local_user?' do
   shared_examples 'return the value' do
-    let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
     it {
       Facter.stubs(:value).with(anything())
       Facter.stubs(:value).with(:hostname).returns('mybox')

spec/functions/sqlserver_upcase_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe "the sqlserver_upcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
   it "should exist" do
     expect(Puppet::Parser::Functions.function("sqlserver_upcase")).to eq("function_sqlserver_upcase")
   end

spec/functions/sqlserver_validate_hash_uniq_values_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe "the sqlserver_validate_hash_uniq_values" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
   it "should exist" do
     expect(Puppet::Parser::Functions.function("sqlserver_validate_hash_uniq_values")).to eq("function_sqlserver_validate_hash_uniq_values")
   end

spec/functions/sqlserver_validate_instance_name_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'sqlserver_validate_instance_name function' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
   it 'should exist' do
     expect(Puppet::Parser::Functions.function("sqlserver_validate_instance_name")).to eq("function_sqlserver_validate_instance_name")
   end

spec/functions/sqlserver_validate_size_spec.rb

@@ -2,8 +2,6 @@
 require 'puppet/error'
 
 describe 'sqlserver_validate_size function' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
   shared_examples 'should compile' do |value|
     it "with a value #{value}" do
       scope.function_sqlserver_validate_size([value])

spec/functions/sqlserver_validate_svrroles_hash_spec.rb

@@ -2,8 +2,6 @@
 require 'puppet/error'
 
 RSpec.describe 'sqlserver_validate_svrroles_hash function' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
   possible_roles = %w(sysadmin serveradmin securityadmin processadmin setupadmin bulkadmin diskadmin dbcreator)
 
   shared_examples 'compile' do |value|