diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-03-03 18:12:13 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-03-03 18:12:13 -0800 |
| commit | 919dd9bde52c2d1d302a0924fb6822b5c0db1656 (patch) | |
| tree | 61306cfabf60d341d5da2d8d4b79c312c5edebb5 | |
| parent | 0cc5c7b763ee9b4a35a8c44611b895a52999f120 (diff) | |
| parent | 455d1978c31c56ad95dd8289552c99891d09bdee (diff) | |
| download | puppet-919dd9bde52c2d1d302a0924fb6822b5c0db1656.tar.gz puppet-919dd9bde52c2d1d302a0924fb6822b5c0db1656.tar.xz puppet-919dd9bde52c2d1d302a0924fb6822b5c0db1656.zip | |
Merge branch 'refactor/next/6582-stop-using-'test-lib-'-for-'spec-'-tests' into next
| -rw-r--r-- | spec/lib/puppet_spec/fixtures.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/puppet_spec/fixtures.rb b/spec/lib/puppet_spec/fixtures.rb index 96bb1e39d..7f6bc2a8f 100644 --- a/spec/lib/puppet_spec/fixtures.rb +++ b/spec/lib/puppet_spec/fixtures.rb @@ -5,7 +5,7 @@ module PuppetSpec::Fixtures def my_fixture_dir callers = caller while line = callers.shift do - next unless found = line.match(%r{puppet/spec/(.*)_spec\.rb:}) + next unless found = line.match(%r{/spec/(.*)_spec\.rb:}) return fixtures(found[1]) end fail "sorry, I couldn't work out your path from the caller stack!" |