projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into 5383-api-db-current-time
[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 216dd2d02d9ebaf3ab7b9fcd4345ad05bd374c9f..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
-
ActiveSupport::JSON.decode @
response.body
+
Oj.load
response.body
end
def api_token(api_client_auth_name)