adapt json rendering tests to JSON v1.5

Author: hhaensel

test/tests_Assets.jl

@@ -14,7 +14,8 @@
     using Genie, Genie.Assets
     Genie.config.websockets_port = 8000 # state gets affected depending on how tests are run -- let's set it explicitly
 
-    @test strip(js_settings()) == strip("window.Genie = {};\nGenie.Settings = {\"websockets_exposed_port\":window.location.port,\"server_host\":\"127.0.0.1\",\"webchannels_autosubscribe\":true,\"webchannels_reconnect_delay\":500,\"env\":\"dev\",\"webchannels_eval_command\":\">eval:\",\"webchannels_alert_overlay\":false,\"websockets_host\":\"127.0.0.1\",\"webchannels_show_alert\":true,\"webthreads_js_file\":\"webthreads.js\",\"webchannels_base64_marker\":\"base64:\",\"webchannels_unsubscribe_channel\":\"unsubscribe\",\"webthreads_default_route\":\"____\",\"webchannels_subscription_trials\":4,\"webchannels_subscribe_channel\":\"subscribe\",\"server_port\":8000,\"webchannels_keepalive_frequency\":30000,\"websockets_exposed_host\":window.location.hostname,\"webchannels_connection_attempts\":10,\"base_path\":\"\",\"websockets_protocol\":window.location.protocol.replace('http', 'ws'),\"webthreads_pull_route\":\"pull\",\"webchannels_default_route\":\"____\",\"webchannels_server_gone_alert_timeout\":10000,\"webchannels_timeout\":1000,\"webthreads_push_route\":\"push\",\"websockets_port\":8000,\"websockets_base_path\":\"\"};")
+    @test strip(js_settings()) == strip("window.Genie = {};\nGenie.Settings = {\"websockets_exposed_port\":window.location.port,\"server_host\":\"127.0.0.1\",\"webchannels_autosubscribe\":true,\"webchannels_reconnect_delay\":500,\"env\":\"dev\",\"webchannels_eval_command\":\">eval:\",\"webchannels_alert_overlay\":false,\"websockets_host\":\"127.0.0.1\",\"webchannels_show_alert\":true,\"webthreads_js_file\":\"webthreads.js\",\"webchannels_base64_marker\":\"base64:\",\"webchannels_unsubscribe_channel\":\"unsubscribe\",\"webthreads_default_route\":\"____\",\"webchannels_subscription_trials\":4,\"webchannels_subscribe_channel\":\"subscribe\",\"server_port\":8000,\"webchannels_keepalive_frequency\":30000,\"websockets_exposed_host\":window.location.hostname,\"webchannels_connection_attempts\":10,\"base_path\":\"\",\"websockets_protocol\":window.location.protocol.replace('http', 'ws'),\"webthreads_pull_route\":\"pull\",\"webchannels_default_route\":\"____\",\"webchannels_server_gone_alert_timeout\":10000,\"webchannels_timeout\":1000,\"webthreads_push_route\":\"push\",\"websockets_port\":8000,\"websockets_base_path\":\"\"};") ||
+          strip(js_settings()) == strip("window.Genie = {};\nGenie.Settings = {\"base_path\":\"\",\"env\":\"dev\",\"server_host\":\"127.0.0.1\",\"server_port\":8000,\"webchannels_alert_overlay\":false,\"webchannels_autosubscribe\":true,\"webchannels_base64_marker\":\"base64:\",\"webchannels_connection_attempts\":10,\"webchannels_default_route\":\"____\",\"webchannels_eval_command\":\">eval:\",\"webchannels_keepalive_frequency\":30000,\"webchannels_reconnect_delay\":500,\"webchannels_server_gone_alert_timeout\":10000,\"webchannels_show_alert\":true,\"webchannels_subscribe_channel\":\"subscribe\",\"webchannels_subscription_trials\":4,\"webchannels_timeout\":1000,\"webchannels_unsubscribe_channel\":\"unsubscribe\",\"websockets_base_path\":\"\",\"websockets_exposed_host\":window.location.hostname,\"websockets_exposed_port\":window.location.port,\"websockets_host\":\"127.0.0.1\",\"websockets_port\":null,\"websockets_protocol\":window.location.protocol.replace('http', 'ws'),\"webthreads_default_route\":\"____\",\"webthreads_js_file\":\"webthreads.js\",\"webthreads_pull_route\":\"pull\",\"webthreads_push_route\":\"push\"};")
   end
 
   @safetestset "Embedded assets" begin

test/tests_json_rendering.jl

@@ -15,7 +15,9 @@
 
       r = json(Genie.Renderer.Path(viewfile[1]), root = "greetings", greetings = words)
 
-      @test String(r.body) == """{"greetings":{"en":"Hello","it":"Ciao","pt":"Ola","es":"Hola"}}"""
+      json_str = String(r.body)
+      @test json_str == """{"greetings":{"en":"Hello","it":"Ciao","pt":"Ola","es":"Hola"}}""" ||
+            json_str == """{"greetings":{"en":"Hello","es":"Hola","it":"Ciao","pt":"Ola"}]"""
 
       Genie.Renderer.clear_task_storage()
     end;