From 98ff3abd09ed447da37f09dce1ed2d95d0d05397 Mon Sep 17 00:00:00 2001 From: Jeff McCune Date: Thu, 19 Jul 2012 16:14:37 -0700 Subject: (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x) This patch is the same approach as the one that want into 2.2.x. It covers the functions in 2.3.x that do not exist in 2.2.x. Without this patch all of the spec tests for parser functions in stdlib would instantiate their own scope instances. This is a problem because the standard library is tightly coupled with the internal behavior of Puppet. Tight coupling like this creates failures when we change the internal behavior of Puppet. This is exactly what happened recently when we changed the method signature for the initializer of Puppet::Parser::Scope instances. This patch fixes the problem by creating scope instances using the puppet labs spec helper. The specific method that provides scope instances in Puppet-version-independent way is something like this: let(:scope) { PuppetlabsSpec::PuppetInternals.scope } This patch simply implements this across the board. --- spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb') diff --git a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb index 1e0b5ac..9d66fcb 100644 --- a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb @@ -1,14 +1,10 @@ require 'spec_helper' describe Puppet::Parser::Functions.function(:validate_absolute_path) do - before :all do - Puppet::Parser::Functions.autoloader.loadall - end + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } # The subject of these examplres is the method itself. - subject do - Puppet::Parser::Scope.new.method :function_validate_absolute_path - end + subject() { scope.method(:function_validate_absolute_path) } describe "Valid Paths" do def self.valid_paths -- cgit v1.2.3 From 424b56da616041e365cb471dafc05a3d7ade4e45 Mon Sep 17 00:00:00 2001 From: Patrick Carlisle Date: Thu, 9 Aug 2012 14:33:10 -0700 Subject: Make sure functions are loaded for each test The test_helper code in Puppet now resets function state between each test. This patch fixes two spec files where the function was not actually loaded in the tests, causing them to fail. --- spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb | 8 ++++++-- spec/unit/puppet/parser/functions/validate_re_spec.rb | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb') diff --git a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb index 9d66fcb..08aaf78 100644 --- a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb @@ -3,8 +3,12 @@ require 'spec_helper' describe Puppet::Parser::Functions.function(:validate_absolute_path) do let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - # The subject of these examplres is the method itself. - subject() { scope.method(:function_validate_absolute_path) } + # The subject of these examples is the method itself. + subject do + # This makes sure the function is loaded within each test + function_name = Puppet::Parser::Functions.function(:validate_absolute_path) + scope.method(function_name) + end describe "Valid Paths" do def self.valid_paths diff --git a/spec/unit/puppet/parser/functions/validate_re_spec.rb b/spec/unit/puppet/parser/functions/validate_re_spec.rb index a07ad47..d189efb 100644 --- a/spec/unit/puppet/parser/functions/validate_re_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_re_spec.rb @@ -5,7 +5,9 @@ describe Puppet::Parser::Functions.function(:validate_re) do # The subject of these examplres is the method itself. subject do - scope.method :function_validate_re + # This makes sure the function is loaded within each test + function_name = Puppet::Parser::Functions.function(:validate_re) + scope.method(function_name) end context 'Using Puppet::Parser::Scope.new' do -- cgit v1.2.3