Skip to content

Commit

Permalink
(MAINT) Coverage fixups and remove dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
scotje committed Apr 12, 2018
1 parent 104a6c7 commit 146d3e9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
9 changes: 0 additions & 9 deletions lib/pdk/util.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,6 @@ def pdk_package_basedir
end
module_function :pdk_package_basedir

def default_package_basedir
if Gem.win_platform?
File.join(ENV['ProgramFiles'], 'Puppet Labs', 'DevelopmentKit')
else
File.join('/', 'opt', 'puppetlabs', 'pdk')
end
end
module_function :default_package_basedir

def package_cachedir
File.join(pdk_package_basedir, 'share', 'cache')
end
Expand Down
12 changes: 11 additions & 1 deletion spec/unit/pdk/util/bundler_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def bundle_regex
# Doesn't matter where this is since all the execs get mocked.
allow(PDK::Util).to receive(:module_root).and_return('/')

allow(instance).to receive(:bundle_cachedir).and_return(bundle_cachedir)
allow(PDK::Util).to receive(:cachedir).and_return(bundle_cachedir)
end

describe '#gemfile' do
Expand Down Expand Up @@ -470,6 +470,16 @@ def bundle_regex
instance.lock!
end

context 'when vendored Gemfile.lock does not exist' do
before(:each) do
allow(File).to receive(:exist?).with("#{package_cachedir}/Gemfile.lock").and_return(false)
end

it 'raises FatalError' do
expect { instance.lock! }.to raise_error(PDK::CLI::FatalError, %r{vendored gemfile\.lock.*not found}i)
end
end

context 'with gem overrides' do
let(:overrides) { { puppet: '1.2.3' } }

Expand Down

0 comments on commit 146d3e9

Please sign in to comment.