Sync with latest Instiki trunk. Changes:
1) Upgrade Rails to 1.2.3 2) Revert RedCloth to previous version (who %#$@ cares?) 3) Preserve the Rails Security fix to vendor/rails/actionpack/lib/action_controller/caching.rb from Revision 80.
This commit is contained in:
parent
ff3e03a45a
commit
7adac51d6d
68 changed files with 466 additions and 257 deletions
19
vendor/rails/railties/lib/tasks/testing.rake
vendored
19
vendor/rails/railties/lib/tasks/testing.rake
vendored
|
@ -30,7 +30,7 @@ end
|
|||
module Kernel
|
||||
def silence_stderr
|
||||
old_stderr = STDERR.dup
|
||||
STDERR.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
|
||||
STDERR.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
|
||||
STDERR.sync = true
|
||||
yield
|
||||
ensure
|
||||
|
@ -40,14 +40,17 @@ end
|
|||
|
||||
desc 'Test all units and functionals'
|
||||
task :test do
|
||||
Rake::Task["test:units"].invoke rescue got_error = true
|
||||
Rake::Task["test:functionals"].invoke rescue got_error = true
|
||||
exceptions = ["test:units", "test:functionals", "test:integration"].collect do |task|
|
||||
begin
|
||||
Rake::Task[task].invoke
|
||||
nil
|
||||
rescue => e
|
||||
e
|
||||
end
|
||||
end.compact
|
||||
|
||||
if File.exist?("test/integration")
|
||||
Rake::Task["test:integration"].invoke rescue got_error = true
|
||||
end
|
||||
|
||||
raise "Test failures" if got_error
|
||||
exceptions.each {|e| puts e;puts e.backtrace }
|
||||
raise "Test failures" unless exceptions.empty?
|
||||
end
|
||||
|
||||
namespace :test do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue