diff options
Diffstat (limited to 'spec/integration/parser')
| -rwxr-xr-x | spec/integration/parser/collector_spec.rb | 5 | ||||
| -rwxr-xr-x | spec/integration/parser/compiler_spec.rb | 5 | ||||
| -rwxr-xr-x | spec/integration/parser/functions/require_spec.rb | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | spec/integration/parser/functions_spec.rb | 7 | ||||
| -rwxr-xr-x | spec/integration/parser/parser_spec.rb | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | spec/integration/parser/ruby_manifest_spec.rb | 5 |
6 files changed, 13 insertions, 19 deletions
diff --git a/spec/integration/parser/collector_spec.rb b/spec/integration/parser/collector_spec.rb index c72e605cf..c14fa4184 100755 --- a/spec/integration/parser/collector_spec.rb +++ b/spec/integration/parser/collector_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +#!/usr/bin/env rspec +require 'spec_helper' require 'puppet/parser/collector' diff --git a/spec/integration/parser/compiler_spec.rb b/spec/integration/parser/compiler_spec.rb index 097e8b03a..9f6aae907 100755 --- a/spec/integration/parser/compiler_spec.rb +++ b/spec/integration/parser/compiler_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +#!/usr/bin/env rspec +require 'spec_helper' describe Puppet::Parser::Compiler do before :each do diff --git a/spec/integration/parser/functions/require_spec.rb b/spec/integration/parser/functions/require_spec.rb index 737efcce8..aa15f92be 100755 --- a/spec/integration/parser/functions/require_spec.rb +++ b/spec/integration/parser/functions/require_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') +#!/usr/bin/env rspec +require 'spec_helper' describe "The require function" do before :each do diff --git a/spec/integration/parser/functions_spec.rb b/spec/integration/parser/functions_spec.rb index 504d1fe5e..6791987d7 100644..100755 --- a/spec/integration/parser/functions_spec.rb +++ b/spec/integration/parser/functions_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +#!/usr/bin/env rspec +require 'spec_helper' describe Puppet::Parser::Functions do before :each do @@ -18,4 +17,4 @@ describe Puppet::Parser::Functions do }.should_not raise_error threads.each { |t| t.join } end -end
\ No newline at end of file +end diff --git a/spec/integration/parser/parser_spec.rb b/spec/integration/parser/parser_spec.rb index b7dfcc3e0..65c9ee302 100755 --- a/spec/integration/parser/parser_spec.rb +++ b/spec/integration/parser/parser_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +#!/usr/bin/env rspec +require 'spec_helper' describe Puppet::Parser::Parser do module ParseMatcher diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb index 110898206..7f3bb71e9 100644..100755 --- a/spec/integration/parser/ruby_manifest_spec.rb +++ b/spec/integration/parser/ruby_manifest_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +#!/usr/bin/env rspec +require 'spec_helper' require 'tempfile' require 'puppet_spec/files' |
