projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4958: Merge branch 'master' into 4958-old-browser-alert
[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 3413f6486a43a3c412cfd18d442f8ac92e480521..5ea6e62bfa73381e0f7e95b79aba31be7143ee08 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-25,7
+25,7
@@
require 'rails/test_help'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
-
ActiveSupport::JSON.decode @
response.body
+
Oj.load
response.body
end
def api_token(api_client_auth_name)
end
def api_token(api_client_auth_name)
@@
-49,6
+49,10
@@
class ActiveSupport::TestCase
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
Thread.current[:user] = nil
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
Thread.current[:user] = nil
+ restore_configuration
+ end
+
+ def restore_configuration
# Restore configuration settings changed during tests
$application_config.each do |k,v|
if k.match /^[^.]*$/
# Restore configuration settings changed during tests
$application_config.each do |k,v|
if k.match /^[^.]*$/
@@
-88,7
+92,7
@@
class ActionController::TestCase
def check_counter action
@counter += 1
if @counter == 2
def check_counter action
@counter += 1
if @counter == 2
-
#
assert_equal 1, 2, "Multiple actions in functional test"
+ assert_equal 1, 2, "Multiple actions in functional test"
end
end
end
end