refactor setup/teardown of test repos

also fixed occasionally failing tmpdir test

test/integration/autobuild_test.rb

@@ -1,15 +1,8 @@
 require "integration_test_helper"
 
 class AutobuildTest < ActionController::IntegrationTest
-  def setup
-    super
-    `cd test/files; mkdir repo; cd repo; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/repo")
-    super
-  end
+  include WithTestRepo
 
   test "if hook name is not found, 404 status is returned with appropriate description" do
     post "/hooks/build/not_found_halp"

test/integration/bitbucket_autobuild_test.rb

@@ -8,7 +8,6 @@ def setup
 
   def teardown
     FileUtils.rm_rf("test/files/repo")
-    FileUtils.rm_rf("builds/*")
     super
   end
 

test/integration/builds_test.rb

@@ -1,15 +1,8 @@
 require "integration_test_helper"
 
 class BuildsTest < ActionController::IntegrationTest
-  def setup
-    super
-    @output = `cd test/files; mkdir repo; cd repo; git init; echo "my file" > file; git add file; git commit -m "my file added"; git log --pretty=format:%H --max-count=1`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/repo")
-    super
-  end
+  include WithTestRepo
 
   test "one can delete build" do
     project = project_with_steps({:name => "myproject", :vcs_source => "test/files/repo", :vcs_type => "git"}, "ls -al file")

test/integration/hooks_test.rb

@@ -7,15 +7,8 @@ class Hooks::NoConfig
 end
 
 class HooksTest < ActionController::IntegrationTest
-  def setup
-    super
-    `cd test/files; mkdir repo; cd repo; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/repo")
-    super
-  end
+  include WithTestRepo
 
   test "hooks config renders hook config partial if it's present" do
     project = project_with_steps({

test/integration/projects_test.rb

@@ -1,15 +1,8 @@
 require "integration_test_helper"
 
 class ProjectsTest < ActionController::IntegrationTest
-  def setup
-    super
-    `cd test/files; mkdir repo; cd repo; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/repo")
-    super
-  end
+  include WithTestRepo
 
   test "user can add a project" do
     visit "/"

test/test_helper.rb

@@ -58,4 +58,34 @@ def run_delayed_jobs
     end
     ran_jobs
   end
+
+  def create_test_repo
+    command = <<-CMD.gsub("\n", "; ")
+      mkdir -p test/files/repo
+      cd test/files/repo
+      git init
+      git config user.name git
+      git config user.email git@example.com
+      echo "my file" > file
+      git add file
+      git commit -m "my file added"
+    CMD
+    `#{command}`
+  end
+
+  def destroy_test_repo
+    FileUtils.rm_rf 'test/files/repo'
+  end
+
+  module WithTestRepo
+    def setup
+      super
+      create_test_repo
+    end
+
+    def teardown
+      destroy_test_repo
+      super
+    end
+  end
 end

test/unit/build_test.rb

@@ -1,27 +1,20 @@
 require 'test_helper'
 
 class BuildTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir koss; cd koss; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/koss")
-    super
-  end
+  include WithTestRepo
 
   test "Project.ajax_reload? method with ajax_reload => always" do
     BigTuna.stubs(:ajax_reload).returns('always')
-      
+
     build = Build.new
 
     build.status = Build::STATUS_IN_QUEUE
     assert(build.ajax_reload?, "Should be true.")
 
     build.status = Build::STATUS_PROGRESS
     assert(build.ajax_reload?, "Should be true.")
-    
+
     build.status = Build::STATUS_OK
     assert(build.ajax_reload?, "Should be true.")
 
@@ -37,15 +30,15 @@ def teardown
 
   test "Project.ajax_reload? method with ajax_reload => building" do
     BigTuna.stubs(:ajax_reload).returns('building')
-      
+
     build = Build.new
 
     build.status = Build::STATUS_IN_QUEUE
     assert(build.ajax_reload?, "Should be true.")
 
     build.status = Build::STATUS_PROGRESS
     assert(build.ajax_reload?, "Should be true.")
-    
+
     build.status = Build::STATUS_OK
     assert(!build.ajax_reload?, "Should be false.")
 
@@ -58,18 +51,18 @@ def teardown
     build.status = Build::STATUS_BUILDER_ERROR
     assert(!build.ajax_reload?, "Should be false.")
   end
-  
+
   test "Project.ajax_reload? method with ajax_reload => false" do
     BigTuna.stubs(:ajax_reload).returns('false')
-          
+
     build = Build.new
 
     build.status = Build::STATUS_IN_QUEUE
     assert(!build.ajax_reload?, "Should be false.")
 
     build.status = Build::STATUS_PROGRESS
     assert(!build.ajax_reload?, "Should be false.")
-    
+
     build.status = Build::STATUS_OK
     assert(!build.ajax_reload?, "Should be false.")
 
@@ -85,8 +78,8 @@ def teardown
 
   test "invalid build is marked as invalid and failed count gets updated" do
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :max_builds => 1,
     }, "ls /not/existing")
     assert_equal 0, project.failed_builds
@@ -100,8 +93,8 @@ def teardown
 
   test "special variable %build_dir% is available in steps" do
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :max_builds => 1,
     }, "ls -al file\nls %build_dir%")
     project.build!
@@ -113,8 +106,8 @@ def teardown
 
   test "special variable %project_dir% is available in steps" do
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :max_builds => 1,
     }, "ls -al file\nls %project_dir%")
     project.build!
@@ -126,8 +119,8 @@ def teardown
 
   test "if step produces white output then it should be set to nil" do
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :max_builds => 1,
     }, "cd %project_dir%")
     project.build!
@@ -139,8 +132,8 @@ def teardown
 
   test "build #to_param includes build display name and project name" do
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :vcs_type => "git",
       :max_builds => 2,
     }, "ls .")

test/unit/git_vcs_test.rb

@@ -3,13 +3,10 @@
 if BigTuna::VCS::Git.supported?
 
 class GitVCSTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir repo; cd repo; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
+
+  include WithTestRepo
 
   def teardown
-    FileUtils.rm_rf("test/files/repo")
     FileUtils.rm_rf("test/files/repo_clone")
     super
   end

test/unit/hooks_test.rb

@@ -10,21 +10,14 @@ def build_finished(build, config); raise "build_finished"; end
 end
 
 class HooksUnitTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir koss; cd koss; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/koss")
-    super
-  end
+  include WithTestRepo
 
   test "if hook produces error it is handled and marks build as hook failed" do
     with_hook_enabled(BigTuna::Hooks::RaisingHook) do
       project = project_with_steps({
-        :name => "Koss",
-        :vcs_source => "test/files/koss",
+        :name => "repo",
+        :vcs_source => "test/files/repo",
         :max_builds => 2,
         :hooks => {"raising_hook" => "raising_hook"},
       }, "true")
@@ -39,8 +32,8 @@ def teardown
   test "if hook is not enabled it won't get executed" do
     with_hook_enabled(BigTuna::Hooks::RaisingHook) do
       project = project_with_steps({
-        :name => "Koss",
-        :vcs_source => "test/files/koss",
+        :name => "repo",
+        :vcs_source => "test/files/repo",
         :max_builds => 2,
         :hooks => {"raising_hook" => "raising_hook"},
       }, "true")

test/unit/irc_hook_test.rb

@@ -1,15 +1,8 @@
 require 'test_helper'
 
 class IrcHookTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir koss; cd koss; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/koss")
-    super
-  end
+  include WithTestRepo
 
   test "IRC message stating that build failed is sent when build failed" do
     BigTuna::Hooks::Irc::Job.any_instance.expects(:perform).at_least_once.returns(true)
@@ -66,8 +59,8 @@ def teardown
   private
   def irc_project_with_steps(steps)
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :vcs_type => "git",
       :max_builds => 2,
       :hooks => {"irc" => "irc"},

test/unit/mailer_hook_test.rb

@@ -1,15 +1,8 @@
 require 'test_helper'
 
 class MailerHookTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir koss; cd koss; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/koss")
-    super
-  end
+  include WithTestRepo
 
   test "mail stating that build failed is sent when build failed" do
     project = mailing_project_with_steps("ls invalid_file_here")
@@ -63,8 +56,8 @@ def teardown
 
   def mailing_project_with_steps(steps)
     project = project_with_steps({
-       :name => "Koss",
-       :vcs_source => "test/files/koss",
+       :name => "repo",
+       :vcs_source => "test/files/repo",
        :max_builds => 2,
        :hooks => {"mailer" => "mailer"},
     }, steps)

test/unit/notifo_hook_test.rb

@@ -1,15 +1,8 @@
 require 'test_helper'
 
 class NotifoHookTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir koss; cd koss; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/koss")
-    super
-  end
+  include WithTestRepo
 
   test "notifo message stating that build failed is sent when build failed" do
     BigTuna::Hooks::Notifo::Job.any_instance.expects(:perform).at_least_once.returns(true)
@@ -60,8 +53,8 @@ def teardown
   private
   def notifo_project_with_steps(steps)
     project = project_with_steps({
-      :name => "Koss",
-      :vcs_source => "test/files/koss",
+      :name => "repo",
+      :vcs_source => "test/files/repo",
       :vcs_type => "git",
       :max_builds => 2,
       :hooks => {"notifo" => "notifo"},

test/unit/project_test.rb

@@ -3,15 +3,8 @@
 require 'tmpdir'
 
 class ProjectTest < ActiveSupport::TestCase
-  def setup
-    super
-    `cd test/files; mkdir repo; cd repo; git init; echo "my file" > file; git add file; git commit -m "my file added"`
-  end
 
-  def teardown
-    FileUtils.rm_rf("test/files/repo")
-    super
-  end
+  include WithTestRepo
 
   def build_and_run_project_with_steps(steps = nil, project_attrs = {})
     steps ||= "ls -al file"
@@ -313,7 +306,7 @@ def build_and_run_project_with_steps(steps = nil, project_attrs = {})
   end
 
   def assert_project_lifecycle(project)
-    assert_match Regexp.new(BigTuna.config[:build_dir]), project.build_dir
+    assert project.build_dir.include?(BigTuna.config[:build_dir])
     assert File.exist?(project.build_dir)
     assert_difference("Dir[File.join(BigTuna.build_dir, '*')].size", -1) do
       project.destroy