Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7625 from vjeux/jest15

Browse Source 
Update to jest 15
This commit is contained in:
Christoph Pojer
2016-09-01 02:56:54 +01:00
committed by GitHub
parent 2e38fcf355 1a113a15c9
commit 1bd55c8cbd
11 changed files with 28 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+10 -8
View File
@@ -58,7 +58,7 @@
"gulp-load-plugins": "^1.2.4",
"gulp-util": "^3.0.7",
"gzip-js": "~0.3.2",
"jest": "^12.1.1",
"jest": "^15.0.1",
"loose-envify": "^1.1.0",
"merge-stream": "^1.0.0",
"object-assign": "^4.1.0",
@@ -90,14 +90,18 @@
"/.module-cache/",
"/react/build/"
],
"persistModuleRegistryBetweenSpecs": true,
"rootDir": "",
"scriptPreprocessor": "scripts/jest/preprocessor.js",
"setupEnvScriptFile": "scripts/jest/environment.js",
"setupFiles": [
"scripts/jest/environment.js"
],
"setupTestFrameworkScriptFile": "scripts/jest/test-framework-setup.js",
"testFileExtensions": [
"coffee",
"testRegex": "/__tests__/",
"moduleFileExtensions": [
"js",
"json",
"node",
"coffee",
"ts"
],
"testPathDirs": [
@@ -107,8 +111,6 @@
"<rootDir>/src",
"node_modules/fbjs"
],
"unmockedModulePathPatterns": [
""
]
"timers": "fake"
}
}
src/isomorphic/modern/class/__tests__/setupSpecEquivalenceReporter.js → scripts/jest/setupSpecEquivalenceReporter.js
View File
src/isomorphic/modern/class/__tests__/ReactClassEquivalence-test.js
+6 -2
View File
@@ -32,7 +32,11 @@ describe('ReactClassEquivalence', function() {
function runJest(testFile) {
var cwd = process.cwd();
var jestBin = path.resolve('node_modules', '.bin', 'jest');
var setupFile = path.resolve(__dirname, 'setupSpecEquivalenceReporter.js');
var setupFile = path.resolve(
'scripts',
'jest',
'setupSpecEquivalenceReporter.js'
);
var result = spawnSync('node', [
jestBin,
testFile,
@@ -60,7 +64,7 @@ function runJest(testFile) {
}
function compareResults(a, b) {
var regexp = /^EQUIVALENCE.*$/gm;
var regexp = /EQUIVALENCE.*$/gm;
var aSpecs = (a.match(regexp) || []).sort().join('\n');
var bSpecs = (b.match(regexp) || []).sort().join('\n');
src/isomorphic/modern/types/__tests__/ReactFlowPropTypes-test.js
-18
View File
@@ -1,18 +0,0 @@
/**
* Copyright 2014-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.
*
* @emails react-core
*/
'use strict';
describe('ReactFlowPropTypes', function() {
// TODO: Test Flow integration and ensure that prop types works.
});
src/isomorphic/modern/types/__tests__/ReactTypeScriptPropTypes-test.js
-18
View File
@@ -1,18 +0,0 @@
/**
* Copyright 2014-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.
*
* @emails react-core
*/
'use strict';
describe('ReactTypeScriptPropTypes', function() {
// TODO: Test TypeScript integration and ensure that prop types works.
});
src/renderers/art/__tests__/ReactART-test.js
-3
View File
@@ -13,9 +13,6 @@
'use strict';
jest
.unmock('ReactART');
var React = require('React');
var ReactDOM = require('ReactDOM');
var ReactTestUtils = require('ReactTestUtils');
src/renderers/dom/server/__tests__/ReactServerRendering-test.js
+10 -10
View File
@@ -45,33 +45,33 @@ describe('ReactServerRendering', function() {
var response = ReactServerRendering.renderToString(
<span>hello world</span>
);
expect(response).toMatch(
expect(response).toMatch(new RegExp(
'<span ' + ROOT_ATTRIBUTE_NAME + '="" ' +
ID_ATTRIBUTE_NAME + '="[^"]+" ' +
ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="[^"]+">hello world</span>'
);
));
});
it('should generate simple markup for self-closing tags', function() {
var response = ReactServerRendering.renderToString(
<img />
);
expect(response).toMatch(
expect(response).toMatch(new RegExp(
'<img ' + ROOT_ATTRIBUTE_NAME + '="" ' +
ID_ATTRIBUTE_NAME + '="[^"]+" ' +
ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="[^"]+"/>'
);
));
});
it('should generate simple markup for attribute with `>` symbol', function() {
var response = ReactServerRendering.renderToString(
<img data-attr=">" />
);
expect(response).toMatch(
expect(response).toMatch(new RegExp(
'<img data-attr="&gt;" ' + ROOT_ATTRIBUTE_NAME + '="" ' +
ID_ATTRIBUTE_NAME + '="[^"]+" ' +
ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="[^"]+"/>'
);
));
});
it('should generate comment markup for component returns null', function() {
@@ -111,7 +111,7 @@ describe('ReactServerRendering', function() {
var response = ReactServerRendering.renderToString(
<Parent />
);
expect(response).toMatch(
expect(response).toMatch(new RegExp(
'<div ' + ROOT_ATTRIBUTE_NAME + '="" ' +
ID_ATTRIBUTE_NAME + '="[^"]+" ' +
ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="[^"]+">' +
@@ -120,7 +120,7 @@ describe('ReactServerRendering', function() {
'<!-- react-text: [0-9]+ -->child<!-- /react-text -->' +
'</span>' +
'</div>'
);
));
});
it('should only execute certain lifecycle methods', function() {
@@ -172,14 +172,14 @@ describe('ReactServerRendering', function() {
<TestComponent />
);
expect(response).toMatch(
expect(response).toMatch(new RegExp(
'<span ' + ROOT_ATTRIBUTE_NAME + '="" ' +
ID_ATTRIBUTE_NAME + '="[^"]+" ' +
ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="[^"]+">' +
'<!-- react-text: [0-9]+ -->Component name: <!-- /react-text -->' +
'<!-- react-text: [0-9]+ -->TestComponent<!-- /react-text -->' +
'</span>'
);
));
expect(lifecycle).toEqual(
['getInitialState', 'componentWillMount', 'render']
);
src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
-5
View File
@@ -9,11 +9,6 @@
*/
'use strict';
jest.unmock('ReactNativeAttributePayload');
jest.unmock('ReactNativePropRegistry');
// jest.dontMock('deepDiffer');
// jest.dontMock('flattenStyle');
var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
var ReactNativePropRegistry = require('ReactNativePropRegistry');
src/renderers/shared/stack/event/__tests__/EventPluginHub-test.js
+1 -3
View File
@@ -11,9 +11,7 @@
'use strict';
jest
.unmock('EventPluginHub')
.mock('isEventSupported');
jest.mock('isEventSupported');
describe('EventPluginHub', function() {
var EventPluginHub;
src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildText-test.js
+1 -1
View File
@@ -60,7 +60,7 @@ var expectChildren = function(d, children) {
openingCommentNode = outerNode.childNodes[mountIndex];
expect(openingCommentNode.nodeType).toBe(8);
expect(openingCommentNode.nodeValue).toMatch(' react-text: [0-9]+ ');
expect(openingCommentNode.nodeValue).toMatch(/ react-text: [0-9]+ /);
if (child === '') {
textNode = null;
src/renderers/shared/utils/__tests__/accumulateInto-test.js
-3
View File
@@ -11,9 +11,6 @@
'use strict';
jest
.unmock('accumulateInto');
var accumulateInto;
describe('accumulateInto', function() {