summaryrefslogtreecommitdiffstats
path: root/spec/integration/provider
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2010-12-06 12:01:18 -0800
committerMatt Robinson <matt@puppetlabs.com>2010-12-06 12:01:18 -0800
commit626d7564467bdc0e9d2d385e9aa10c539d9ed175 (patch)
treebff625caf757ccd42b3e8dd902214531efb41fdf /spec/integration/provider
parentb9f3847cd2c7efb954f428224d8d721f9edafd64 (diff)
downloadpuppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.tar.gz
puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.tar.xz
puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.zip
maint: Use expand_path when requiring spec_helper or puppettest
Doing a require to a relative path can cause files to be required more than once when they're required from different relative paths. If you expand the path fully, this won't happen. Ruby 1.9 also requires that you use expand_path when doing these requires. Paired-with: Jesse Wolfe
Diffstat (limited to 'spec/integration/provider')
-rwxr-xr-xspec/integration/provider/mailalias/aliases_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/provider/mailalias/aliases_spec.rb b/spec/integration/provider/mailalias/aliases_spec.rb
index 0511205f2..685cbd29d 100755
--- a/spec/integration/provider/mailalias/aliases_spec.rb
+++ b/spec/integration/provider/mailalias/aliases_spec.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
require 'puppettest/support/utils'
require 'puppettest/fileparsing'