projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10645-cr-mounts-display
[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 0919985a9f6337b0452c71aa42d26e8dfe24acd2..38f44c5d9b54ed4557bdfbf9be8c8376146357b9 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-1,8
+1,14
@@
ENV["RAILS_ENV"] = "test"
unless ENV["NO_COVERAGE_TEST"]
begin
ENV["RAILS_ENV"] = "test"
unless ENV["NO_COVERAGE_TEST"]
begin
- require 'simplecov'
- require 'simplecov-rcov'
+ verbose_orig = $VERBOSE
+ begin
+ $VERBOSE = nil
+ require 'simplecov'
+ require 'simplecov-rcov'
+ ensure
+ $VERBOSE = verbose_orig
+ end
class SimpleCov::Formatter::MergedFormatter
def format(result)
SimpleCov::Formatter::HTMLFormatter.new.format(result)
class SimpleCov::Formatter::MergedFormatter
def format(result)
SimpleCov::Formatter::HTMLFormatter.new.format(result)
@@
-60,6
+66,14
@@
class ActiveSupport::TestCase
User.invalidate_permissions_cache
end
User.invalidate_permissions_cache
end
+ def assert_equal(expect, *args)
+ if expect.nil?
+ assert_nil(*args)
+ else
+ super
+ end
+ end
+
def assert_not_allowed
# Provide a block that calls a Rails boolean "true or false" success value,
# like model.save or model.destroy. This method will test that it either
def assert_not_allowed
# Provide a block that calls a Rails boolean "true or false" success value,
# like model.save or model.destroy. This method will test that it either