From fc32905903f82b04d5ade361632d1c960bdbde37 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 9 Mar 2016 15:48:02 +1100 Subject: [PATCH] Pass test metadata through to the client via `meteorEnv` For #6331 --- packages/meteor-env-dev/server.js | 3 ++- packages/meteor-env-prod/server.js | 3 ++- packages/meteor/test_environment.js | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/meteor-env-dev/server.js b/packages/meteor-env-dev/server.js index e178071ab1..101761b024 100644 --- a/packages/meteor-env-dev/server.js +++ b/packages/meteor-env-dev/server.js @@ -1,3 +1,4 @@ meteorEnv = { - NODE_ENV: process.env.NODE_ENV || "development" + NODE_ENV: process.env.NODE_ENV || "development", + TEST_METADATA: process.env.TEST_METADATA || "{}" }; diff --git a/packages/meteor-env-prod/server.js b/packages/meteor-env-prod/server.js index 15e49d147b..08db552f10 100644 --- a/packages/meteor-env-prod/server.js +++ b/packages/meteor-env-prod/server.js @@ -1,3 +1,4 @@ meteorEnv = { - NODE_ENV: process.env.NODE_ENV || "production" + NODE_ENV: process.env.NODE_ENV || "production", + TEST_METADATA: process.env.TEST_METADATA || "{}" }; diff --git a/packages/meteor/test_environment.js b/packages/meteor/test_environment.js index f465d4fe3a..37d6f811bd 100644 --- a/packages/meteor/test_environment.js +++ b/packages/meteor/test_environment.js @@ -1,4 +1,11 @@ -var TEST_METADATA = process.env.TEST_METADATA || {}; +var TEST_METADATA_STR; +if (Meteor.isClient) { + TEST_METADATA_STR = meteorEnv.TEST_METADATA; +} else { + TEST_METADATA_STR = process.env.TEST_METADATA; +} + +var TEST_METADATA = JSON.parse(TEST_METADATA_STR || "{}"); Meteor.isTest = !!TEST_METADATA.isTest; Meteor.isAppTest = !!TEST_METADATA.isAppTest;