From b75da89d09cf72a1714ebef4580e422131182ed5 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 6 Feb 2014 12:18:49 -0800 Subject: [PATCH] continued efforts towards released self-test --- tools/release.js | 12 +++++++++++- tools/tests/old/test-bundler-assets.js | 2 +- tools/tests/old/test-bundler-npm.js | 2 +- tools/tests/old/test-bundler-options.js | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/release.js b/tools/release.js index d823b6a617..0c7c2c4261 100644 --- a/tools/release.js +++ b/tools/release.js @@ -191,7 +191,7 @@ release.setCurrent = function (releaseObject, forced) { release.forced = !! forced; }; -// XXX XXX HACK: Change the packageDirs attribet on +// XXX XXX HACK: Change the packageDirs attribute on // release.current. This is terrible form, but we have a legacy test // (the bundler test) that needs it. The right way to fix this is to // #HandlePackageDirsDifferently @@ -204,3 +204,13 @@ release._resetPackageDirs = function (packageDirs) { manifest: release.current._manifest }); }; + +// XXX hack +release._setCurrentForOldTest = function () { + if (process.env.METEOR_SPRINGBOARD_RELEASE) { + release.setCurrent(release.load(process.env.METEOR_SPRINGBOARD_RELEASE), + true); + } else { + release.setCurrent(release.load(null)); + } +}; diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js index 732ddf2474..09922b0fdb 100644 --- a/tools/tests/old/test-bundler-assets.js +++ b/tools/tests/old/test-bundler-assets.js @@ -133,7 +133,7 @@ var runTest = function () { var Fiber = require('fibers'); Fiber(function () { - release.setCurrent(release.load(null)); + release._setCurrentForOldTest(); try { runTest(); diff --git a/tools/tests/old/test-bundler-npm.js b/tools/tests/old/test-bundler-npm.js index 4a20deddb0..82613fd231 100644 --- a/tools/tests/old/test-bundler-npm.js +++ b/tools/tests/old/test-bundler-npm.js @@ -381,7 +381,7 @@ var runTest = function () { var Fiber = require('fibers'); Fiber(function () { - release.setCurrent(release.load(null)); + release._setCurrentForOldTest(); meteorNpm._printNpmCalls = true; try { diff --git a/tools/tests/old/test-bundler-options.js b/tools/tests/old/test-bundler-options.js index 4c578c9e06..1304dad392 100644 --- a/tools/tests/old/test-bundler-options.js +++ b/tools/tests/old/test-bundler-options.js @@ -135,7 +135,7 @@ var runTest = function () { var Fiber = require('fibers'); Fiber(function () { - release.setCurrent(release.load(null)); + release._setCurrentForOldTest(); try { runTest();