From f6a0861c408ca44aec872b511cbb9dca1b3b1253 Mon Sep 17 00:00:00 2001
From: Chris Roberts <code@chrisroberts.org>
Date: Wed, 9 Nov 2016 16:29:23 -0800
Subject: [PATCH 1/2] Add stub test for salt provisioner

---
 .../provisioners/salt/provisioner_test.rb     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 test/unit/plugins/provisioners/salt/provisioner_test.rb

diff --git a/test/unit/plugins/provisioners/salt/provisioner_test.rb b/test/unit/plugins/provisioners/salt/provisioner_test.rb
new file mode 100644
index 00000000000..93ce44a8759
--- /dev/null
+++ b/test/unit/plugins/provisioners/salt/provisioner_test.rb
@@ -0,0 +1,35 @@
+require_relative "../../../base"
+
+require Vagrant.source_root.join("plugins/provisioners/salt/provisioner")
+
+describe VagrantPlugins::Salt::Provisioner do
+  include_context "unit"
+
+  subject { described_class.new(machine, config) }
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
+  let(:config)       { double("config") }
+  let(:communicator) { double("comm") }
+  let(:guest)        { double("guest") }
+
+  before do
+    machine.stub(communicate: communicator)
+    machine.stub(guest: guest)
+
+    communicator.stub(execute: true)
+    communicator.stub(upload: true)
+
+    guest.stub(capability?: false)
+  end
+
+  describe "#provision" do
+
+  end
+end

From 2219a4def0c84fe08f4a54ff86dafe7689d361f4 Mon Sep 17 00:00:00 2001
From: Chris Roberts <code@chrisroberts.org>
Date: Wed, 9 Nov 2016 16:29:36 -0800
Subject: [PATCH 2/2] Fix Hash construction for constant value in salt
 provisioner

---
 plugins/provisioners/salt/provisioner.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 76ee4c54fa3..465edc5639a 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -6,7 +6,7 @@ class Provisioner < Vagrant.plugin("2", :provisioner)
 
       # Default path values to set within configuration only
       # if configuration value is unset and local path exists
-      OPTIMISTIC_PATH_DEFAULTS = Hash[[
+      OPTIMISTIC_PATH_DEFAULTS = Hash[*[
         "minion_config", "salt/minion",
         "minion_key", "salt/key/minion.key",
         "minion_pub", "salt/key/minion.pub",