projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 8019-crunchrun-log-throttle
[arvados.git]
/
services
/
api
/
test
/
test_helper.rb
diff --git
a/services/api/test/test_helper.rb
b/services/api/test/test_helper.rb
index 417ddf6bee8eeee96d8e960099ccc227cee4950a..86bc2397c5309e98310f659d4077d7d0f8a33184 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-22,7
+22,7
@@
end
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
-require 'mocha
/mini_test
'
+require 'mocha'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
@@
-84,7
+84,7
@@
class ActiveSupport::TestCase
def restore_configuration
# Restore configuration settings changed during tests
$application_config.each do |k,v|
def restore_configuration
# Restore configuration settings changed during tests
$application_config.each do |k,v|
- if k.match
/^[^.]*$/
+ if k.match
(/^[^.]*$/)
Rails.configuration.send (k + '='), v
end
end
Rails.configuration.send (k + '='), v
end
end
@@
-112,9
+112,18
@@
class ActiveSupport::TestCase
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
- def s
low_test
-
skip "RAILS_TEST_SHORT is set" unless
(ENV['RAILS_TEST_SHORT'] || '').empty?
+ def s
elf.skip_slow_tests?
+
!
(ENV['RAILS_TEST_SHORT'] || '').empty?
end
end
+
+ def self.skip(*args, &block)
+ end
+
+ def self.slow_test(name, &block)
+ define_method(name, block) unless skip_slow_tests?
+ end
+
+ alias_method :skip, :omit
end
class ActionController::TestCase
end
class ActionController::TestCase
@@
-135,6
+144,21
@@
class ActionController::TestCase
super action, *args
end
end
super action, *args
end
end
+
+ def self.suite
+ s = super
+ def s.run(*args)
+ @test_case.startup()
+ begin
+ super
+ ensure
+ @test_case.shutdown()
+ end
+ end
+ s
+ end
+ def self.startup; end
+ def self.shutdown; end
end
class ActionDispatch::IntegrationTest
end
class ActionDispatch::IntegrationTest