From e5b7c94cb423c359d207430dbf86bde28a731532 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 8 Jan 2011 10:09:04 +0000 Subject: [PATCH] Merged r4643 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4659 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/ci.rake | 1 + lib/tasks/testing.rake | 150 ++++++++++++++++++++++------------------- 2 files changed, 83 insertions(+), 68 deletions(-) diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 092575317..e6cf78fa3 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -16,6 +16,7 @@ namespace :ci do Rake::Task["db:create"].invoke Rake::Task["db:migrate"].invoke Rake::Task["db:schema:dump"].invoke + Rake::Task["test:scm:update"].invoke end desc "Build Redmine" diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake index 27eb053f4..45066ae30 100644 --- a/lib/tasks/testing.rake +++ b/lib/tasks/testing.rake @@ -1,68 +1,82 @@ -### From http://svn.geekdaily.org/public/rails/plugins/generally_useful/tasks/coverage_via_rcov.rake - -namespace :test do - desc 'Measures test coverage' - task :coverage do - rm_f "coverage" - rm_f "coverage.data" - rcov = "rcov --rails --aggregate coverage.data --text-summary -Ilib --html" - files = Dir.glob("test/**/*_test.rb").join(" ") - system("#{rcov} #{files}") - system("open coverage/index.html") if PLATFORM['darwin'] - end - - desc 'Run unit and functional scm tests' - task :scm do - errors = %w(test:scm:units test:scm:functionals).collect do |task| - begin - Rake::Task[task].invoke - nil - rescue => e - task - end - end.compact - abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any? - end - - namespace :scm do - namespace :setup do - desc "Creates directory for test repositories" - task :create_dir do - FileUtils.mkdir_p Rails.root + '/tmp/test' - end - - supported_scms = [:subversion, :cvs, :bazaar, :mercurial, :git, :darcs, :filesystem] - - desc "Creates a test subversion repository" - task :subversion => :create_dir do - repo_path = "tmp/test/subversion_repository" - system "svnadmin create #{repo_path}" - system "gunzip < test/fixtures/repositories/subversion_repository.dump.gz | svnadmin load #{repo_path}" - end - - (supported_scms - [:subversion]).each do |scm| - desc "Creates a test #{scm} repository" - task scm => :create_dir do - system "gunzip < test/fixtures/repositories/#{scm}_repository.tar.gz | tar -xv -C tmp/test" - end - end - - desc "Creates all test repositories" - task :all => supported_scms - end - - Rake::TestTask.new(:units => "db:test:prepare") do |t| - t.libs << "test" - t.verbose = true - t.test_files = FileList['test/unit/repository*_test.rb'] + FileList['test/unit/lib/redmine/scm/**/*_test.rb'] - end - Rake::Task['test:scm:units'].comment = "Run the scm unit tests" - - Rake::TestTask.new(:functionals => "db:test:prepare") do |t| - t.libs << "test" - t.verbose = true - t.test_files = FileList['test/functional/repositories*_test.rb'] - end - Rake::Task['test:scm:functionals'].comment = "Run the scm functional tests" - end -end +### From http://svn.geekdaily.org/public/rails/plugins/generally_useful/tasks/coverage_via_rcov.rake + +namespace :test do + desc 'Measures test coverage' + task :coverage do + rm_f "coverage" + rm_f "coverage.data" + rcov = "rcov --rails --aggregate coverage.data --text-summary -Ilib --html" + files = Dir.glob("test/**/*_test.rb").join(" ") + system("#{rcov} #{files}") + system("open coverage/index.html") if PLATFORM['darwin'] + end + + desc 'Run unit and functional scm tests' + task :scm do + errors = %w(test:scm:units test:scm:functionals).collect do |task| + begin + Rake::Task[task].invoke + nil + rescue => e + task + end + end.compact + abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any? + end + + namespace :scm do + namespace :setup do + desc "Creates directory for test repositories" + task :create_dir do + FileUtils.mkdir_p Rails.root + '/tmp/test' + end + + supported_scms = [:subversion, :cvs, :bazaar, :mercurial, :git, :darcs, :filesystem] + + desc "Creates a test subversion repository" + task :subversion => :create_dir do + repo_path = "tmp/test/subversion_repository" + system "svnadmin create #{repo_path}" + system "gunzip < test/fixtures/repositories/subversion_repository.dump.gz | svnadmin load #{repo_path}" + end + + (supported_scms - [:subversion]).each do |scm| + desc "Creates a test #{scm} repository" + task scm => :create_dir do + system "gunzip < test/fixtures/repositories/#{scm}_repository.tar.gz | tar -xv -C tmp/test" + end + end + + desc "Creates all test repositories" + task :all => supported_scms + end + + desc "Updates installed test repositories" + task :update do + require 'fileutils' + Dir.glob("tmp/test/*_repository").each do |dir| + next unless File.basename(dir) =~ %r{^(.+)_repository$} && File.directory?(dir) + scm = $1 + next unless fixture = Dir.glob("test/fixtures/repositories/#{scm}_repository.*").first + next if File.stat(dir).ctime > File.stat(fixture).mtime + + FileUtils.rm_rf dir + Rake::Task["test:scm:setup:#{scm}"].execute + end + end + + Rake::TestTask.new(:units => "db:test:prepare") do |t| + t.libs << "test" + t.verbose = true + t.test_files = FileList['test/unit/repository*_test.rb'] + FileList['test/unit/lib/redmine/scm/**/*_test.rb'] + end + Rake::Task['test:scm:units'].comment = "Run the scm unit tests" + + Rake::TestTask.new(:functionals => "db:test:prepare") do |t| + t.libs << "test" + t.verbose = true + t.test_files = FileList['test/functional/repositories*_test.rb'] + end + Rake::Task['test:scm:functionals'].comment = "Run the scm functional tests" + end +end -- 2.39.5