summaryrefslogtreecommitdiff
path: root/spec/unit/pops/loaders/loader_paths_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/unit/pops/loaders/loader_paths_spec.rb')
-rw-r--r--spec/unit/pops/loaders/loader_paths_spec.rb19
1 files changed, 4 insertions, 15 deletions
diff --git a/spec/unit/pops/loaders/loader_paths_spec.rb b/spec/unit/pops/loaders/loader_paths_spec.rb
index 2929fe7f8..2cd565a8c 100644
--- a/spec/unit/pops/loaders/loader_paths_spec.rb
+++ b/spec/unit/pops/loaders/loader_paths_spec.rb
@@ -5,7 +5,6 @@ require 'puppet/loaders'
describe 'loader paths' do
include PuppetSpec::Files
- before(:each) { Puppet[:biff] = true }
let(:static_loader) { Puppet::Pops::Loader::StaticLoader.new() }
let(:unused_loaders) { nil }
@@ -17,17 +16,13 @@ describe 'loader paths' do
'lib' => {
'puppet' => {
'functions' => {},
- 'parser' => {
- 'functions' => {},
- }
}}})
module_loader = Puppet::Pops::Loader::ModuleLoaders::FileBased.new(static_loader, unused_loaders, 'testmodule', module_dir, 'test1')
effective_paths = Puppet::Pops::Loader::LoaderPaths.relative_paths_for_type(:function, module_loader)
expect(effective_paths.collect(&:generic_path)).to eq([
- File.join(module_dir, 'lib', 'puppet', 'functions'), # 4x functions
- File.join(module_dir, 'lib', 'puppet','parser', 'functions') # 3x functions
+ File.join(module_dir, 'lib', 'puppet', 'functions')
])
end
@@ -39,8 +34,6 @@ describe 'loader paths' do
expect(effective_paths.size).to be_eql(1)
expect(effective_paths[0].generic_path).to be_eql(File.join(module_dir, 'lib', 'puppet', 'functions'))
- expect(module_loader.path_index.size).to be_eql(1)
- expect(module_loader.path_index.include?(File.join(module_dir, 'lib', 'puppet', 'functions', 'foo.rb'))).to be(true)
end
it 'all function smart-paths produces entries if they exist' do
@@ -48,19 +41,15 @@ describe 'loader paths' do
'lib' => {
'puppet' => {
'functions' => {'foo4x.rb' => 'ignored in this test'},
- 'parser' => {
- 'functions' => {'foo3x.rb' => 'ignored in this test'},
- }
}}})
module_loader = Puppet::Pops::Loader::ModuleLoaders::FileBased.new(static_loader, unused_loaders, 'testmodule', module_dir, 'test1')
effective_paths = module_loader.smart_paths.effective_paths(:function)
- expect(effective_paths.size).to eq(2)
- expect(module_loader.path_index.size).to eq(2)
+ expect(effective_paths.size).to eq(1)
+ expect(module_loader.path_index.size).to eq(1)
path_index = module_loader.path_index
- expect(path_index.include?(File.join(module_dir, 'lib', 'puppet', 'functions', 'foo4x.rb'))).to eq(true)
- expect(path_index.include?(File.join(module_dir, 'lib', 'puppet', 'parser', 'functions', 'foo3x.rb'))).to eq(true)
+ expect(path_index).to include(File.join(module_dir, 'lib', 'puppet', 'functions', 'foo4x.rb'))
end
end
end