diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js index fafa12a996..b342084c7e 100644 --- a/packages/reload-safetybelt/package.js +++ b/packages/reload-safetybelt/package.js @@ -4,12 +4,14 @@ Package.describe({ }); Package.onUse(function (api) { + api.use("ecmascript"); api.use("webapp", "server"); api.addFiles("reload-safety-belt.js", "server"); api.addAssets("safetybelt.js", "server"); }); Package.onTest(function (api) { + api.use("ecmascript"); api.addAssets("safetybelt.js", "server"); api.use(["reload-safetybelt", "tinytest", "http", "webapp", "underscore"]); api.addFiles("reload-safety-belt-tests.js", "server"); diff --git a/packages/reload-safetybelt/reload-safety-belt-tests.js b/packages/reload-safetybelt/reload-safety-belt-tests.js index 117a0110a5..8e79a6f96d 100644 --- a/packages/reload-safetybelt/reload-safety-belt-tests.js +++ b/packages/reload-safetybelt/reload-safety-belt-tests.js @@ -1,10 +1,11 @@ -var script = Assets.getText("safetybelt.js"); +await (async () => { + var script = await Assets.getText("safetybelt.js"); -Tinytest.add("reload-safetybelt - safety belt is added", function (test) { - test.isTrue(_.some( - WebAppInternals.additionalStaticJs, - function (js, pathname) { - return js === script; - } - )); -}); + Tinytest.add("reload-safetybelt - safety belt is added", function (test) { + test.isTrue( + _.some(WebAppInternals.additionalStaticJs, function (js, pathname) { + return js === script; + }) + ); + }); +})(); diff --git a/packages/reload-safetybelt/reload-safety-belt.js b/packages/reload-safetybelt/reload-safety-belt.js index 4c255ab3a7..60bd28b6e6 100644 --- a/packages/reload-safetybelt/reload-safety-belt.js +++ b/packages/reload-safetybelt/reload-safety-belt.js @@ -3,4 +3,6 @@ // chance of hitting an old server for the HTML and the new server for the JS or // CSS. This prevents you from displaying the page in that case, and instead // reloads it, presumably all on the new version now. -WebAppInternals.addStaticJs(Assets.getText("safetybelt.js")); +await (async () => { + WebAppInternals.addStaticJs(await Assets.getText("safetybelt.js")); +})(); diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh index 8b2aa13623..20df9742e4 100755 --- a/packages/test-in-console/run.sh +++ b/packages/test-in-console/run.sh @@ -10,6 +10,10 @@ export METEOR_HOME=`pwd` export phantom=$phantom +# force fibers to be disabled +export DISABLE_FIBERS=1 +export IGNORE_ASYNC_PLUGIN=1 + # only install dependencies if required if [ "$phantom" = true ] then