Error rename and coverage for bootstrap class

Author: Kevin Paulisse

lib/octocatalog-diff/catalog-util/bootstrap.rb

@@ -101,7 +101,7 @@ def self.git_checkout(logger, dir_opts)
         logger.debug("Begin git checkout #{dir_opts[:basedir]}:#{dir_opts[:branch]} -> #{dir_opts[:path]}")
         OctocatalogDiff::CatalogUtil::Git.check_out_git_archive(dir_opts.merge(logger: logger))
         logger.debug("Success git checkout #{dir_opts[:basedir]}:#{dir_opts[:branch]} -> #{dir_opts[:path]}")
-      rescue OctocatalogDiff::CatalogUtil::Git::GitCheckoutError => exc
+      rescue OctocatalogDiff::Errors::GitCheckoutError => exc
         logger.error("Git checkout error: #{exc}")
         raise OctocatalogDiff::Errors::BootstrapError, exc
       end

spec/octocatalog-diff/tests/catalog-util/bootstrap_spec.rb

@@ -164,4 +164,29 @@
       end
     end
   end
+
+  describe '#git_checkout' do
+    context 'with successful git checkout' do
+      it 'should log success messages' do
+        expect(OctocatalogDiff::CatalogUtil::Git).to receive(:check_out_git_archive)
+        logger, logger_str = OctocatalogDiff::Spec.setup_logger
+        opts = { basedir: '/tmp/foo', branch: 'foo', path: '/tmp/bar' }
+        described_class.git_checkout(logger, opts)
+        expect(logger_str.string).to match(%r{Begin git checkout /tmp/foo:foo -> /tmp/bar})
+        expect(logger_str.string).to match(%r{Success git checkout /tmp/foo:foo -> /tmp/bar})
+      end
+    end
+
+    context 'with failed git checkout' do
+      it 'should log error messages and raise OctocatalogDiff::Errors::BootstrapError' do
+        expect(OctocatalogDiff::CatalogUtil::Git).to receive(:check_out_git_archive)
+          .and_raise(OctocatalogDiff::Errors::GitCheckoutError, 'Oopsie')
+        logger, logger_str = OctocatalogDiff::Spec.setup_logger
+        opts = { basedir: '/tmp/foo', branch: 'foo', path: '/tmp/bar' }
+        expect { described_class.git_checkout(logger, opts) }.to raise_error(OctocatalogDiff::Errors::BootstrapError)
+        expect(logger_str.string).to match(%r{Begin git checkout /tmp/foo:foo -> /tmp/bar})
+        expect(logger_str.string).to match(/Git checkout error: Oopsie/)
+      end
+    end
+  end
 end