summaryrefslogtreecommitdiff
path: root/spec/unit/puppet
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-07-19 16:14:37 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-07-23 09:13:08 -0700
commit98ff3abd09ed447da37f09dce1ed2d95d0d05397 (patch)
tree4b3db6ddfcdc204f68aeda875201be38a436dd1c /spec/unit/puppet
parentf3caf5f49383344228482b93ad533d06244a3cac (diff)
downloadpuppet-stdlib-98ff3abd09ed447da37f09dce1ed2d95d0d05397.tar.gz
puppet-stdlib-98ff3abd09ed447da37f09dce1ed2d95d0d05397.tar.bz2
(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.
Diffstat (limited to 'spec/unit/puppet')
-rw-r--r--spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb20
-rw-r--r--spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb8
-rw-r--r--spec/unit/puppet/parser/functions/validate_re_spec.rb8
-rwxr-xr-xspec/unit/puppet/parser/functions/validate_slength_spec.rb8
4 files changed, 12 insertions, 32 deletions
diff --git a/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb b/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb
index 11485aa..a692c31 100644
--- a/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb
+++ b/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb
@@ -1,39 +1,33 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
require 'spec_helper'
describe "the str2saltedsha512 function" do
- before :all do
- Puppet::Parser::Functions.autoloader.loadall
- end
-
- before :each do
- @scope = Puppet::Parser::Scope.new
- end
+ let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
it "should exist" do
Puppet::Parser::Functions.function("str2saltedsha512").should == "function_str2saltedsha512"
end
it "should raise a ParseError if there is less than 1 argument" do
- expect { @scope.function_str2saltedsha512([]) }.should( raise_error(Puppet::ParseError) )
+ expect { scope.function_str2saltedsha512([]) }.should( raise_error(Puppet::ParseError) )
end
it "should raise a ParseError if there is more than 1 argument" do
- expect { @scope.function_str2saltedsha512(['foo', 'bar', 'baz']) }.should( raise_error(Puppet::ParseError) )
+ expect { scope.function_str2saltedsha512(['foo', 'bar', 'baz']) }.should( raise_error(Puppet::ParseError) )
end
it "should return a salted-sha512 password hash 136 characters in length" do
- result = @scope.function_str2saltedsha512(["password"])
+ result = scope.function_str2saltedsha512(["password"])
result.length.should(eq(136))
end
it "should raise an error if you pass a non-string password" do
- expect { @scope.function_str2saltedsha512([1234]) }.should( raise_error(Puppet::ParseError) )
+ expect { scope.function_str2saltedsha512([1234]) }.should( raise_error(Puppet::ParseError) )
end
it "should generate a valid password" do
# Allow the function to generate a password based on the string 'password'
- password_hash = @scope.function_str2saltedsha512(["password"])
+ password_hash = scope.function_str2saltedsha512(["password"])
# Separate the Salt and Password from the Password Hash
salt = password_hash[0..7]
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
diff --git a/spec/unit/puppet/parser/functions/validate_re_spec.rb b/spec/unit/puppet/parser/functions/validate_re_spec.rb
index c35ae14..a07ad47 100644
--- a/spec/unit/puppet/parser/functions/validate_re_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_re_spec.rb
@@ -1,13 +1,7 @@
require 'spec_helper'
describe Puppet::Parser::Functions.function(:validate_re) do
- before :all do
- Puppet::Parser::Functions.autoloader.loadall
- end
-
- let(:scope) do
- scope = Puppet::Parser::Scope.new
- end
+ let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
# The subject of these examplres is the method itself.
subject do
diff --git a/spec/unit/puppet/parser/functions/validate_slength_spec.rb b/spec/unit/puppet/parser/functions/validate_slength_spec.rb
index d2d4ca0..eccf908 100755
--- a/spec/unit/puppet/parser/functions/validate_slength_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_slength_spec.rb
@@ -1,13 +1,9 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
require 'spec_helper'
describe "the validate_slength function" do
- before :all do
- Puppet::Parser::Functions.autoloader.loadall
- end
-
- let(:scope) { Puppet::Parser::Scope.new }
+ let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
it "should exist" do
Puppet::Parser::Functions.function("validate_slength").should == "function_validate_slength"