Removing automatically reset modules between test run

Reviewed By: bestander

Differential Revision: D3886125

fbshipit-source-id: c8f47c3466add1e2c89649a1c6f47b01f0d7a89e
This commit is contained in:
Cristian Carlesso 2016-09-19 12:30:50 -07:00 committed by Facebook Github Bot 3
parent 2d21260ce6
commit bb80ef6326
5 changed files with 163 additions and 118 deletions

View File

@ -21,6 +21,7 @@ describe('code transformation worker:', () => {
let extractDependencies, transform; let extractDependencies, transform;
beforeEach(() => { beforeEach(() => {
jest.resetModules();
({transformCode} = require('..')); ({transformCode} = require('..'));
extractDependencies = extractDependencies =
require('../extract-dependencies').mockReturnValue({}); require('../extract-dependencies').mockReturnValue({});
@ -58,7 +59,10 @@ describe('code transformation worker:', () => {
}); });
}); });
it('removes the leading assignment to `module.exports` before passing on the result if the file is a JSON file, even if minified', done => { it(
'removes the leading assignment to `module.exports` before passing ' +
'on the result if the file is a JSON file, even if minified',
done => {
const result = { const result = {
code: 'p.exports={a:1,b:2}', code: 'p.exports={a:1,b:2}',
}; };
@ -69,7 +73,8 @@ describe('code transformation worker:', () => {
expect(data.code).toBe('{a:1,b:2}'); expect(data.code).toBe('{a:1,b:2}');
done(); done();
}); });
}); }
);
it('removes shebang when present', done => { it('removes shebang when present', done => {
const shebang = '#!/usr/bin/env node'; const shebang = '#!/usr/bin/env node';
@ -110,7 +115,10 @@ describe('code transformation worker:', () => {
}); });
}); });
it('uses `dependencies` and `dependencyOffsets` provided by `extractDependencies` for the result', done => { it(
'uses `dependencies` and `dependencyOffsets` ' +
'provided by `extractDependencies` for the result',
done => {
const dependencyData = { const dependencyData = {
dependencies: ['arbitrary', 'list', 'of', 'dependencies'], dependencies: ['arbitrary', 'list', 'of', 'dependencies'],
dependencyOffsets: [12, 119, 185, 328, 471], dependencyOffsets: [12, 119, 185, 328, 471],
@ -121,24 +129,37 @@ describe('code transformation worker:', () => {
expect(data).toEqual(objectContaining(dependencyData)); expect(data).toEqual(objectContaining(dependencyData));
done(); done();
}); });
}); }
);
it('does not extract requires if files are marked as "extern"', done => { it('does not extract requires if files are marked as "extern"', done => {
transformCode(transform, 'filename', 'code', {extern: true}, (_, {dependencies, dependencyOffsets}) => { transformCode(
transform,
'filename',
'code',
{extern: true},
(_, {dependencies, dependencyOffsets}) => {
expect(extractDependencies).not.toBeCalled(); expect(extractDependencies).not.toBeCalled();
expect(dependencies).toEqual([]); expect(dependencies).toEqual([]);
expect(dependencyOffsets).toEqual([]); expect(dependencyOffsets).toEqual([]);
done(); done();
}); }
);
}); });
it('does not extract requires of JSON files', done => { it('does not extract requires of JSON files', done => {
transformCode(transform, 'arbitrary.json', '{"arbitrary":"json"}', {}, (_, {dependencies, dependencyOffsets}) => { transformCode(
transform,
'arbitrary.json',
'{"arbitrary":"json"}',
{},
(_, {dependencies, dependencyOffsets}) => {
expect(extractDependencies).not.toBeCalled(); expect(extractDependencies).not.toBeCalled();
expect(dependencies).toEqual([]); expect(dependencies).toEqual([]);
expect(dependencyOffsets).toEqual([]); expect(dependencyOffsets).toEqual([]);
done(); done();
}); }
);
}); });
}); });

View File

@ -26,6 +26,7 @@ let FileWatcher;
describe('processRequest', () => { describe('processRequest', () => {
let SourceMapConsumer, Bundler, Server, AssetServer, Promise; let SourceMapConsumer, Bundler, Server, AssetServer, Promise;
beforeEach(() => { beforeEach(() => {
jest.resetModules();
SourceMapConsumer = require('source-map').SourceMapConsumer; SourceMapConsumer = require('source-map').SourceMapConsumer;
Bundler = require('../../Bundler'); Bundler = require('../../Bundler');
Server = require('../'); Server = require('../');
@ -253,7 +254,10 @@ describe('processRequest', () => {
jest.runAllTicks(); jest.runAllTicks();
}); });
it('does not rebuild the bundles that contain a file when that file is changed, even when hot loading is enabled', () => { it(
'does not rebuild the bundles that contain a file ' +
'when that file is changed, even when hot loading is enabled',
() => {
const bundleFunc = jest.fn(); const bundleFunc = jest.fn();
bundleFunc bundleFunc
.mockReturnValueOnce( .mockReturnValueOnce(
@ -382,7 +386,10 @@ describe('processRequest', () => {
server.processRequest(req, res); server.processRequest(req, res);
jest.runAllTimers(); jest.runAllTimers();
expect(AssetServer.prototype.get).toBeCalledWith('imgs/主页/logo.png', undefined); expect(AssetServer.prototype.get).toBeCalledWith(
'imgs/\u{4E3B}\u{9875}/logo.png',
undefined
);
expect(res.setHeader).toBeCalledWith('Cache-Control', 'max-age=31536000'); expect(res.setHeader).toBeCalledWith('Cache-Control', 'max-age=31536000');
expect(res.end).toBeCalledWith('i am image'); expect(res.end).toBeCalledWith('i am image');
}); });

View File

@ -22,6 +22,7 @@ describe('FileWatcher', () => {
let config; let config;
beforeEach(() => { beforeEach(() => {
jest.resetModules();
const sane = require('sane'); const sane = require('sane');
WatchmanWatcher = sane.WatchmanWatcher; WatchmanWatcher = sane.WatchmanWatcher;
WatchmanWatcher.prototype.once.mockImplementation( WatchmanWatcher.prototype.once.mockImplementation(

View File

@ -40,6 +40,8 @@ describe('DependencyGraph', function() {
} }
beforeEach(function() { beforeEach(function() {
jest.resetModules();
Module = require('../Module'); Module = require('../Module');
const fileWatcher = { const fileWatcher = {
on: function() { on: function() {
@ -245,7 +247,7 @@ describe('DependencyGraph', function() {
...defaults, ...defaults,
roots: [root], roots: [root],
}); });
return getOrderedDependenciesAsJSON(dgraph, '/root/index.js', null, false).then(function(deps) { return getOrderedDependenciesAsJSON(dgraph, '/root/index.js', null, false).then((deps) => {
expect(deps) expect(deps)
.toEqual([ .toEqual([
{ {
@ -1918,7 +1920,7 @@ describe('DependencyGraph', function() {
}); });
}); });
pit('should support browser mapping of a package to a file ("' + fieldName + '")', function() { pit('should support browser mapping of a package to a file ("' + fieldName + '")', () => {
var root = '/root'; var root = '/root';
setMockFileSystem({ setMockFileSystem({
'root': { 'root': {
@ -2337,7 +2339,8 @@ describe('DependencyGraph', function() {
'node-package-c': 'rn-package-c', 'node-package-c': 'rn-package-c',
}, },
}), }),
'index.js': 'require("node-package-a"); require("node-package-b"); require("node-package-c");', 'index.js':
'require("node-package-a"); require("node-package-b"); require("node-package-c");',
'node_modules': { 'node_modules': {
'node-package-a': { 'node-package-a': {
'package.json': JSON.stringify({ 'package.json': JSON.stringify({
@ -2510,7 +2513,9 @@ describe('DependencyGraph', function() {
}); });
}); });
pit('should only use `extraNodeModules` after checking all possible filesystem locations', () => { pit(
'should only use `extraNodeModules` after checking all possible filesystem locations',
() => {
const root = '/root'; const root = '/root';
setMockFileSystem({ setMockFileSystem({
[root.slice(1)]: { [root.slice(1)]: {
@ -2553,7 +2558,8 @@ describe('DependencyGraph', function() {
}, },
]); ]);
}); });
}); }
);
pit('should be able to resolve paths within `extraNodeModules`', () => { pit('should be able to resolve paths within `extraNodeModules`', () => {
const root = '/root'; const root = '/root';

View File

@ -1,3 +1,12 @@
/**
* Copyright (c) 2013-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
// Copyright Joyent, Inc. and other Node contributors. // Copyright Joyent, Inc. and other Node contributors.
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
@ -50,6 +59,7 @@ describe('fast-path', () => {
}; };
beforeEach(function() { beforeEach(function() {
jest.resetModules();
process.platform = 'linux'; process.platform = 'linux';
}); });