diff --git a/src/Assets.jl b/src/Assets.jl
index 67c398d2f..c97a50f07 100644
--- a/src/Assets.jl
+++ b/src/Assets.jl
@@ -259,7 +259,7 @@ function js_settings(channel::String = Genie.config.webchannels_default_route) :
end
"""
- window.Genie = window.Genie || {};
+ window.Genie = {};
Genie.Settings = $settings;
"""
end
diff --git a/test/tests_Assets.jl b/test/tests_Assets.jl
index 913146762..91c6c5e43 100644
--- a/test/tests_Assets.jl
+++ b/test/tests_Assets.jl
@@ -14,7 +14,7 @@
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,\"webchannels_subscription_trials\":4,\"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_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\":\"\"};\n")
+ @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\":\"\"};")
end
@safetestset "Embedded assets" begin
@@ -23,7 +23,7 @@
@test Assets.channels()[1:18] == "window.Genie = {};"
@test channels_script()[1:27] == ""
+ @test channels_support() == ""
@test Genie.Router.routes()[1].path == "/genie.jl/$(Genie.Assets.package_version("Genie"))/assets/js/channels.js"
@test Genie.Router.channels()[1].path == "/$(Genie.config.webchannels_default_route)/unsubscribe"
@test Genie.Router.channels()[2].path == "/$(Genie.config.webchannels_default_route)/subscribe"