Merge pull request #542 from puppetlabs/maint-spec_fixes

(MAINT) Fix spec tests

Author: david22swan

spec/unit/puppet/provider/vcsrepo/git_spec.rb

@@ -507,8 +507,9 @@ def branch_a_list(include_branch = nil?)
     it "uses 'git fetch --tags'" do
       resource.delete(:source)
       expect_chdir
+      expect(provider).to receive(:exec_git).with('--version').and_return('2.36.1')
       expect(provider).to receive(:exec_git).with('fetch', 'origin')
-      expect(provider).to receive(:exec_git).with('fetch', '--tags', 'origin')
+      expect(provider).to receive(:exec_git).with('fetch', '--tags', '--force', 'origin')
       provider.update_references
     end
   end
@@ -562,6 +563,8 @@ def branch_a_list(include_branch = nil?)
       expect(FileUtils).to receive(:chown_R).with('john', nil, '/tmp/test')
       expect(provider).to receive(:exec_git).with('fetch', 'origin')
       expect(provider).to receive(:exec_git).with('fetch', '--tags', 'origin')
+
+      allow(provider).to receive(:exec_git).with('--version').and_return('2.13.0')
       provider.update_references
     end
     it 'with excludes run filtered chown_R' do
@@ -574,6 +577,8 @@ def branch_a_list(include_branch = nil?)
       expect(provider).to receive(:set_excludes)
       expect(provider).to receive(:exec_git).with('fetch', 'origin')
       expect(provider).to receive(:exec_git).with('fetch', '--tags', 'origin')
+
+      allow(provider).to receive(:exec_git).with('--version').and_return('2.13.0')
       provider.update_references
     end
   end

spec/unit/puppet/provider/vcsrepo/svn_spec.rb

@@ -99,6 +99,8 @@
                                                        *test_paths_parents)
         expect(provider).to receive(:svn_wrapper).with('--non-interactive', 'update',
                                                        *resource[:includes])
+
+        allow(provider).to receive(:return_svn_client_version).and_return('1.8.0')
         provider.create
       end
       it 'performs a sparse checkout at a specific revision' do
@@ -118,6 +120,8 @@
         expect(provider).to receive(:svn_wrapper).with('--non-interactive', 'update', '-r',
                                                        resource.value(:revision),
                                                        *resource[:includes])
+
+        allow(provider).to receive(:return_svn_client_version).and_return('1.8.0')
         provider.create
       end
       it 'performs a sparse checkout with a specific depth' do
@@ -134,6 +138,8 @@
         expect(provider).to receive(:svn_wrapper).with('--non-interactive', 'update',
                                                        '--depth', resource.value(:depth),
                                                        *resource[:includes])
+
+        allow(provider).to receive(:return_svn_client_version).and_return('1.8.0')
         provider.create
       end
       it 'performs a sparse checkout at a specific depth and revision' do
@@ -155,6 +161,8 @@
                                                        '-r', resource.value(:revision),
                                                        '--depth', resource.value(:depth),
                                                        *resource[:includes])
+
+        allow(provider).to receive(:return_svn_client_version).and_return('1.8.0')
         provider.create
       end
     end