issue #36 - acceptance and unit tests for this issue

jantman · Nov 18, 2015 · 57523d5 · 57523d5
1 parent 9644676
commit 57523d5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/lib/vagrant-r10k/helpers.rb b/lib/vagrant-r10k/helpers.rb
@@ -123,8 +123,10 @@ def module_path(env, prov, env_dir_path)
           module_path = env[:machine].config.r10k.module_path
           if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path)
             raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; please correct this condition"))
+          elsif prov.config.module_path.nil?
+            env[:ui].info "vagrant-r10k: Puppet provisioner module_path is nil, assuming puppet4 environment mode"
           elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
-            raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; please correct this condition"))
+            raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner (#{prov.config.module_path}); please correct this condition"))
           end
         # no modulepath explict set in config, build one from the provisioner config
         else

diff --git a/spec/acceptance/vagrant-r10k/vagrant-r10k_spec.rb b/spec/acceptance/vagrant-r10k/vagrant-r10k_spec.rb
@@ -131,7 +131,7 @@
       status("Test: vagrant up")
       up_result = execute('vagrant', 'up', "--provider=#{provider}")
       expect(up_result).to exit_with(1)
-      expect(up_result.stderr).to match('RuntimeError: vagrant-r10k: module_path "puppet/NOTmodules" is not the same as in puppet provisioner; please correct this condition')
+      expect(up_result.stderr).to match(/RuntimeError: vagrant-r10k: module_path "puppet\/NOTmodules" is not the same as in puppet provisioner \(puppet\/modules\); please correct this condition/)
       ensure_r10k_didnt_run(up_result, environment.workdir)
       ensure_puppet_didnt_run(up_result)
     end

diff --git a/spec/unit/helpers_spec.rb b/spec/unit/helpers_spec.rb
@@ -284,7 +284,17 @@
         env = {:machine => double, :ui => double}
         allow(env[:ui]).to receive(:info).with("vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"\". (if module_path is an array, first element is used)")
         env[:machine].stub_chain(:config, :r10k, :module_path).and_return('r10kmodule/path')
-        expect { module_path(env, prov_dbl, '/env/dir/path') }.to raise_error(VagrantPlugins::R10k::Helpers::ErrorWrapper, /module_path "r10kmodule\/path" is not the same as in puppet provisioner; please correct this condition/)
+        expect { module_path(env, prov_dbl, '/env/dir/path') }.to raise_error(VagrantPlugins::R10k::Helpers::ErrorWrapper, /module_path "r10kmodule\/path" is not the same as in puppet provisioner \(module\/path\); please correct this condition/)
+      end
+    end
+    context 'config.r10k.module_path set and provisioner module_path nil' do
+      it 'returns the joined module_path' do
+        prov_dbl = double
+        prov_dbl.stub_chain(:config, :module_path).and_return(nil)
+        env = {:machine => double, :ui => double}
+        allow(env[:ui]).to receive(:info).with("vagrant-r10k: Puppet provisioner module_path is nil, assuming puppet4 environment mode")
+        env[:machine].stub_chain(:config, :r10k, :module_path).and_return('module/path')
+        expect(module_path(env, prov_dbl, '/env/dir/path')).to eq('/env/dir/path/module/path')
       end
     end
   end