Skip to content

(MODULES-3435) remove symlinks #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
pkg/
Gemfile.lock
vendor/
spec/fixtures/
spec/fixtures/manifests/site.pp
spec/fixtures/modules/*
.vagrant/
.bundle/
coverage/
log/
.idea/
*.iml
tmp/
1 change: 0 additions & 1 deletion spec/fixtures/modules/stdlib/lib

This file was deleted.

1 change: 0 additions & 1 deletion spec/fixtures/modules/stdlib/manifests

This file was deleted.

43 changes: 26 additions & 17 deletions spec/functions/load_module_metadata_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,34 @@
it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
it { is_expected.to run.with_params("one", "two", "three").and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }

it "should json parse the file" do
allow(scope).to receive(:function_get_module_path).with(['science']).and_return('/path/to/module/')
allow(File).to receive(:exists?).with(/metadata.json/).and_return(true)
allow(File).to receive(:read).with(/metadata.json/).and_return('{"name": "spencer-science"}')
describe "when calling with valid arguments" do
before :each do
if RSpec.configuration.puppet_future
allow(File).to receive(:read).with(/\/stdlib\/metadata.json/, {:encoding=>"utf-8"}).and_return('{"name": "puppetlabs-stdlib"}')
else
allow(File).to receive(:read).with(/\/stdlib\/metadata.json/).and_return('{"name": "puppetlabs-stdlib"}')
end
end
it "should json parse the file" do
allow(scope).to receive(:function_get_module_path).with(['science']).and_return('/path/to/module/')
allow(File).to receive(:exists?).with('/path/to/module/metadata.json').and_return(true)
allow(File).to receive(:read).with('/path/to/module/metadata.json').and_return('{"name": "spencer-science"}')

result = subject.call(['science'])
expect(result['name']).to eq('spencer-science')
end
result = subject.call(['science'])
expect(result['name']).to eq('spencer-science')
end

it "should fail by default if there is no metadata.json" do
allow(scope).to receive(:function_get_module_path).with(['science']).and_return('/path/to/module/')
allow(File).to receive(:exists?).with(/metadata.json/).and_return(false)
expect {subject.call(['science'])}.to raise_error(Puppet::ParseError)
end
it "should fail by default if there is no metadata.json" do
allow(scope).to receive(:function_get_module_path).with(['science']).and_return('/path/to/module/')
allow(File).to receive(:exists?).with('/path/to/module/metadata.json').and_return(false)
expect {subject.call(['science'])}.to raise_error(Puppet::ParseError)
end

it "should return nil if user allows empty metadata.json" do
allow(scope).to receive(:function_get_module_path).with(['science']).and_return('/path/to/module/')
allow(File).to receive(:exists?).with(/metadata.json/).and_return(false)
result = subject.call(['science', true])
expect(result).to eq({})
it "should return nil if user allows empty metadata.json" do
allow(scope).to receive(:function_get_module_path).with(['science']).and_return('/path/to/module/')
allow(File).to receive(:exists?).with('/path/to/module/metadata.json').and_return(false)
result = subject.call(['science', true])
expect(result).to eq({})
end
end
end
67 changes: 39 additions & 28 deletions spec/functions/loadjson_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,46 @@
it { is_expected.not_to eq(nil) }
it { is_expected.to run.with_params().and_raise_error(ArgumentError, /wrong number of arguments/i) }

context 'when a non-existing file is specified' do
let(:filename) { '/tmp/doesnotexist' }
before {
File.expects(:exists?).with(filename).returns(false).once
PSON.expects(:load).never
}
it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
end
describe "when calling with valid arguments" do
before :each do
if RSpec.configuration.puppet_future
allow(File).to receive(:read).with(/\/stdlib\/metadata.json/, {:encoding=>"utf-8"}).and_return('{"name": "puppetlabs-stdlib"}')
else
allow(File).to receive(:read).with(/\/stdlib\/metadata.json/).and_return('{"name": "puppetlabs-stdlib"}')
end
end

context 'when an existing file is specified' do
let(:filename) { '/tmp/doesexist' }
let(:data) { { 'key' => 'value' } }
let(:json) { '{"key":"value"}' }
before {
File.expects(:exists?).with(filename).returns(true).once
File.expects(:read).with(filename).returns(json).once
PSON.expects(:load).with(json).returns(data).once
}
it { is_expected.to run.with_params(filename).and_return(data) }
end
context 'when a non-existing file is specified' do
let(:filename) { '/tmp/doesnotexist' }
before {
allow(File).to receive(:exists?).with(filename).and_return(false).once
allow(PSON).to receive(:load).never
}
it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
end

context 'when an existing file is specified' do
let(:filename) { '/tmp/doesexist' }
let(:data) { { 'key' => 'value' } }
let(:json) { '{"key":"value"}' }
before {
allow(File).to receive(:exists?).with(filename).and_return(true).once
allow(File).to receive(:read).with(filename).and_return(json).once
allow(File).to receive(:read).with(filename).and_return(json).once
allow(PSON).to receive(:load).with(json).and_return(data).once
}
it { is_expected.to run.with_params(filename).and_return(data) }
end

context 'when the file could not be parsed' do
let(:filename) { '/tmp/doesexist' }
let(:json) { '{"key":"value"}' }
before {
File.expects(:exists?).with(filename).returns(true).once
File.expects(:read).with(filename).returns(json).once
PSON.stubs(:load).with(json).once.raises StandardError, 'Something terrible have happened!'
}
it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
context 'when the file could not be parsed' do
let(:filename) { '/tmp/doesexist' }
let(:json) { '{"key":"value"}' }
before {
allow(File).to receive(:exists?).with(filename).and_return(true).once
allow(File).to receive(:read).with(filename).and_return(json).once
allow(PSON).to receive(:load).with(json).once.and_raise StandardError, 'Something terrible have happened!'
}
it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
end
end
end