From cf7d196c459df20e6f50787cf43d2fd7ea514b6a Mon Sep 17 00:00:00 2001 From: Amjad Masad Date: Wed, 25 Feb 2015 12:57:33 -0800 Subject: [PATCH] [react-packager] Fix jest tests --- jestSupport/env.js | 5 +++++ jestSupport/scriptPreprocess.js | 4 ++++ package.json | 7 +++++-- packager/react-packager/, | 0 packager/react-packager/package.json | 14 -------------- packager/react-packager/src/JSTransformer/Cache.js | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 jestSupport/env.js delete mode 100644 packager/react-packager/, delete mode 100644 packager/react-packager/package.json diff --git a/jestSupport/env.js b/jestSupport/env.js new file mode 100644 index 000000000..16f264feb --- /dev/null +++ b/jestSupport/env.js @@ -0,0 +1,5 @@ +'use strict'; + +global.setImmediate = global.setImmediate || function(fn) { + return setTimeout(fn, 0); +}; diff --git a/jestSupport/scriptPreprocess.js b/jestSupport/scriptPreprocess.js index 9231196c8..02d3f6341 100644 --- a/jestSupport/scriptPreprocess.js +++ b/jestSupport/scriptPreprocess.js @@ -10,6 +10,10 @@ module.exports = { transformSource: transformSource, process: function(src, fileName) { + if (fileName.match(/node_modules/)) { + return src; + } + try { return transformSource(src); } catch(e) { diff --git a/package.json b/package.json index 93a723ff5..fd61ab087 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,15 @@ }, "jest": { "scriptPreprocessor": "jestSupport/scriptPreprocess.js", + "setupEnvScriptFile": "jestSupport/env.js", "testPathIgnorePatterns": [ - "/node_modules/", - "/packager/" + "/node_modules/" ], "testFileExtensions": [ "js" + ], + "unmockedModulePathPatterns": [ + "source-map" ] }, "scripts": { diff --git a/packager/react-packager/, b/packager/react-packager/, deleted file mode 100644 index e69de29bb..000000000 diff --git a/packager/react-packager/package.json b/packager/react-packager/package.json deleted file mode 100644 index 0ac47c257..000000000 --- a/packager/react-packager/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "react-packager", - "version": "0.1.0", - "description": "", - "main": "index.js", - "jest": { - "unmockedModulePathPatterns": [ - "source-map" - ], - "testPathIgnorePatterns": [ - "JSAppServer/node_modules" - ] - } -} diff --git a/packager/react-packager/src/JSTransformer/Cache.js b/packager/react-packager/src/JSTransformer/Cache.js index f04ffe9fe..b98bedd96 100644 --- a/packager/react-packager/src/JSTransformer/Cache.js +++ b/packager/react-packager/src/JSTransformer/Cache.js @@ -1,7 +1,7 @@ 'use strict'; var path = require('path'); -var version = require('../../package.json').version; +var version = require('../../../../package.json').version; var tmpdir = require('os').tmpDir(); var pathUtils = require('../fb-path-utils'); var declareOpts = require('../lib/declareOpts');