Merge pull request #548 from puppetlabs/GH-540-fixing_test_failures

(GH-540) Fix acceptance test failures

Author: david22swan

spec/acceptance/clone_repo_spec.rb

@@ -2,14 +2,9 @@
 
 require 'spec_helper_acceptance'
 
-tmpdir = '/tmp/vcsrepo'
-
 describe 'clones a remote repo' do
   before(:all) do
-    my_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    run_shell("rm -rf #{tmpdir}")
-    bolt_upload_file("#{my_root}/acceptance/files", tmpdir, 'create_git_repo.sh')
-    run_shell("cd #{tmpdir} && ./create_git_repo.sh")
+    create_repo
   end
 
   after(:all) do

spec/acceptance/create_repo_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper_acceptance'
 
-tmpdir = '/tmp/vcsrepo'
-
 describe 'create a repo' do
   context 'with without a source' do
     pp = <<-MANIFEST

spec/acceptance/multiple_remotes_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper_acceptance'
 
-tmpdir = '/tmp/vcsrepo'
-
 describe 'clones a remote repo', unless: only_supports_weak_encryption do
   before(:all) do
     File.expand_path(File.join(File.dirname(__FILE__), '..'))

spec/acceptance/remove_repo_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper_acceptance'
 
-tmpdir = '/tmp/vcsrepo'
-
 describe 'remove a repo' do
   pp = <<-MANIFEST
     vcsrepo { "#{tmpdir}/testrepo_deleted":

spec/acceptance/revision_spec.rb

@@ -2,14 +2,9 @@
 
 require 'spec_helper_acceptance'
 
-tmpdir = '/tmp/vcsrepo'
-
 describe 'changing revision' do
   before(:all) do
-    # Create testrepo.git
-    my_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    bolt_upload_file("#{my_root}/acceptance/files", tmpdir, 'create_git_repo.sh')
-    run_shell("cd #{tmpdir} && ./create_git_repo.sh")
+    create_repo
 
     # Configure testrepo.git as upstream of testrepo
     pp = <<-MANIFEST

spec/spec_helper_acceptance_local.rb

@@ -7,6 +7,21 @@ class LitmusHelper
   include PuppetLitmus
 end
 
+def tmpdir
+  '/tmp/vcsrepo'
+end
+
+def project_root
+  File.expand_path(File.join(File.dirname(__FILE__)))
+end
+
+def create_repo
+  LitmusHelper.instance.run_shell("rm -rf #{tmpdir}")
+  LitmusHelper.instance.run_shell("mkdir -p #{tmpdir}")
+  LitmusHelper.instance.bolt_upload_file("#{project_root}/acceptance/files/create_git_repo.sh", "#{tmpdir}/create_git_repo.sh")
+  LitmusHelper.instance.run_shell("cd #{tmpdir} && ./create_git_repo.sh")
+end
+
 RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation