diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-26 11:26:57 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-26 11:26:57 -0500 |
| commit | d03f68eaed6d05483128b495ad1faaf89208d66a (patch) | |
| tree | 3883c1dfb9ab8b1d4eed37eda13f7bb64ee851b8 /test/rails | |
| parent | c0a07ac724c27fce8d2673e4466e42d46d68f145 (diff) | |
| download | puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.tar.gz puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.tar.xz puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.zip | |
Changing the test/ classes so that they work from the main
test/ dir or from their own working dir, like the specs do.
This was just a question of changing how their libraries
are loaded.
Diffstat (limited to 'test/rails')
| -rwxr-xr-x | test/rails/ast.rb | 2 | ||||
| -rwxr-xr-x | test/rails/collection.rb | 2 | ||||
| -rwxr-xr-x | test/rails/configuration.rb | 2 | ||||
| -rwxr-xr-x | test/rails/host.rb | 2 | ||||
| -rwxr-xr-x | test/rails/rails.rb | 2 | ||||
| -rwxr-xr-x | test/rails/railsparameter.rb | 2 | ||||
| -rwxr-xr-x | test/rails/railsresource.rb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/test/rails/ast.rb b/test/rails/ast.rb index 48ec18c45..ac086fde1 100755 --- a/test/rails/ast.rb +++ b/test/rails/ast.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' require 'puppet/rails' diff --git a/test/rails/collection.rb b/test/rails/collection.rb index cbae9a1e4..d0eecca89 100755 --- a/test/rails/collection.rb +++ b/test/rails/collection.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/rails' diff --git a/test/rails/configuration.rb b/test/rails/configuration.rb index 277753945..ea66bc902 100755 --- a/test/rails/configuration.rb +++ b/test/rails/configuration.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' require 'puppet/parser/parser' diff --git a/test/rails/host.rb b/test/rails/host.rb index 0d97e0ffa..dd1bb2a42 100755 --- a/test/rails/host.rb +++ b/test/rails/host.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/rails' diff --git a/test/rails/rails.rb b/test/rails/rails.rb index f6756ed24..c3b48b90e 100755 --- a/test/rails/rails.rb +++ b/test/rails/rails.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/rails' diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb index c2a82929d..d83115b1a 100755 --- a/test/rails/railsparameter.rb +++ b/test/rails/railsparameter.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/rails' diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb index 7a1ffd217..58058472d 100755 --- a/test/rails/railsresource.rb +++ b/test/rails/railsresource.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/rails' |