From 146d3e9a6908ae206385805cf46a7722dd23cb9c Mon Sep 17 00:00:00 2001
From: Jesse Scott <jesse@puppetlabs.com>
Date: Thu, 12 Apr 2018 14:23:05 -0700
Subject: [PATCH] (MAINT) Coverage fixups and remove dead code

---
 lib/pdk/util.rb                    |  9 ---------
 spec/unit/pdk/util/bundler_spec.rb | 12 +++++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/pdk/util.rb b/lib/pdk/util.rb
index 152b71e65..4d5190343 100644
--- a/lib/pdk/util.rb
+++ b/lib/pdk/util.rb
@@ -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
diff --git a/spec/unit/pdk/util/bundler_spec.rb b/spec/unit/pdk/util/bundler_spec.rb
index 1744dd8c6..a6c068ef8 100644
--- a/spec/unit/pdk/util/bundler_spec.rb
+++ b/spec/unit/pdk/util/bundler_spec.rb
@@ -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
@@ -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' } }