diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 09:00:11 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 09:00:11 -0700 |
commit | f3caf5f49383344228482b93ad533d06244a3cac (patch) | |
tree | 9144840436f9aba8d14313ad5c26bb59c6cb5d80 /spec/unit/puppet/parser/functions/zip_spec.rb | |
parent | 730aee4ef999b73a16d13a6792e10343dbdcabea (diff) | |
parent | a1bab586ba6fcf2b3035898d1002d0a6ef89d7c8 (diff) | |
download | puppet-stdlib-f3caf5f49383344228482b93ad533d06244a3cac.tar.gz puppet-stdlib-f3caf5f49383344228482b93ad533d06244a3cac.tar.bz2 |
Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x
* 2.2.x:
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
(Maint) Fix interpreter lines
Diffstat (limited to 'spec/unit/puppet/parser/functions/zip_spec.rb')
-rw-r--r-- | spec/unit/puppet/parser/functions/zip_spec.rb | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/spec/unit/puppet/parser/functions/zip_spec.rb b/spec/unit/puppet/parser/functions/zip_spec.rb index 074f4df..f45ab17 100644 --- a/spec/unit/puppet/parser/functions/zip_spec.rb +++ b/spec/unit/puppet/parser/functions/zip_spec.rb @@ -1,26 +1,15 @@ -#!/usr/bin/env rspec +#! /usr/bin/env ruby -S rspec require 'spec_helper' describe "the zip function" do - before :all do - Puppet::Parser::Functions.autoloader.loadall - end - - before :each do - @scope = Puppet::Parser::Scope.new - end - - it "should exist" do - Puppet::Parser::Functions.function("zip").should == "function_zip" - end + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } it "should raise a ParseError if there is less than 1 arguments" do - lambda { @scope.function_zip([]) }.should( raise_error(Puppet::ParseError)) + lambda { scope.function_zip([]) }.should( raise_error(Puppet::ParseError)) end it "should be able to zip an array" do - result = @scope.function_zip([['1','2','3'],['4','5','6']]) + result = scope.function_zip([['1','2','3'],['4','5','6']]) result.should(eq([["1", "4"], ["2", "5"], ["3", "6"]])) end - end |