13803: Re-enable Oj's rails optimizations & fix time format test failures.
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 16 Jul 2018 20:52:52 +0000 (17:52 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 16 Jul 2018 20:52:52 +0000 (17:52 -0300)
There's one failing test pending on collection controller: when asking for
the index with select="" the followin exception is being masked by
load_limit_offset_order_params():

JSON::ParserError: Empty input at line 1, column 1 [parse.c:928]

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

services/api/config/initializers/oj_mimic_json.rb [new file with mode: 0644]
services/api/config/initializers/time_format.rb

diff --git a/services/api/config/initializers/oj_mimic_json.rb b/services/api/config/initializers/oj_mimic_json.rb
new file mode 100644 (file)
index 0000000..ce2d40c
--- /dev/null
@@ -0,0 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+require 'oj'
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+Oj::Rails.optimize()
+Oj::Rails.mimic_JSON()
+
index 3d690930ae18a1a4d1956f0872b37eec77d9d228..78cabc87ac7cd5f66a07becb1207be53ff6e2af3 100644 (file)
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+ActiveSupport::JSON::Encoding.time_precision = 9
+
 class ActiveSupport::TimeWithZone
   remove_method :as_json
   def as_json *args