From a598356e124105e30af78a5baad35cbc42bcf749 Mon Sep 17 00:00:00 2001
From: Ryan Davis <ryand-ruby@zenspider.com>
Date: Wed, 14 Aug 2019 14:26:46 -0700
Subject: [PATCH] Strip down plugin helper and change windows prefix execution.

Powershell doesn't use "&&" and we have it all over the tests.
Changing to ";".

Also starting to unify the plugin helper w/ the functional helper
since it has a LOT of duplication.

Signed-off-by: Ryan Davis <zenspider@chef.io>
---
 lib/plugins/shared/core_plugin_test_helper.rb | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/plugins/shared/core_plugin_test_helper.rb b/lib/plugins/shared/core_plugin_test_helper.rb
index d99fb0d84..764959fda 100644
--- a/lib/plugins/shared/core_plugin_test_helper.rb
+++ b/lib/plugins/shared/core_plugin_test_helper.rb
@@ -12,6 +12,7 @@ require "tmpdir"
 require "pathname"
 require "forwardable"
 
+require "functional/helper"
 require "inspec/plugin/v2"
 
 # Configure Minitest to expose things like `let`
@@ -36,28 +37,24 @@ end
 #   end
 # end
 
+# TODO: remove me! There's no need!
 module CorePluginBaseHelper
-  libdir = File.expand_path "lib"
-
-  let(:repo_path) { File.expand_path(File.join(__FILE__, "..", "..", "..", "..")) }
-  let(:inspec_path) { File.join(repo_path, "inspec-bin", "bin", "inspec") }
-  let(:exec_inspec) { [Gem.ruby, "-I#{libdir}", inspec_path].join " " }
-  let(:core_mock_path) { File.join(repo_path, "test", "fixtures") }
-  let(:core_fixture_plugins_path) { File.join(core_mock_path, "plugins") }
-  let(:core_config_dir_path) { File.join(core_mock_path, "config_dirs") }
+  let(:mock_path) { File.join(repo_path, "test", "fixtures", "mock") }
+  let(:core_fixture_plugins_path) { File.join(mock_path, "plugins") }
+  let(:core_config_dir_path) { File.join(mock_path, "config_dirs") }
 
   let(:registry) { Inspec::Plugin::V2::Registry.instance }
 end
 
-require "functional/helper"
-
 module CorePluginFunctionalHelper
   include CorePluginBaseHelper
   include FunctionalHelper
 
+  # TODO: so much duplication! Remove everything we can!
   require "train"
   TRAIN_CONNECTION = Train.create("local", command_runner: :generic).connection
 
+  # TODO: remove me! it's in test/functional/helper.rb
   def run_inspec_process(command_line, opts = {})
     prefix = ""
     if opts.key?(:prefix)
@@ -65,6 +62,7 @@ module CorePluginFunctionalHelper
     elsif opts.key?(:env)
       prefix = opts[:env].to_a.map { |assignment| "#{assignment[0]}=#{assignment[1]}" }.join(" ")
     end
+
     TRAIN_CONNECTION.run_command("#{prefix} #{exec_inspec} #{command_line}")
   end