Skip to content

Commit

Permalink
Convert test suite to Jest (#4550)
Browse files Browse the repository at this point in the history
* convert mocha tests to jest

* jest 23

* add jest configs

* use material css

* fix windows

* forceExit jest test

* force exit eject

* test

* test

* retrigger test

* remove appveyor comment

* try to remove pretendToBeVisual option

* use jsdom env

* test environment

* no cache

* test no close

* bring back raf

* test revert all broken changes

* add back jsdom

* remove jsdom

* node test environment

* use latest change

* runInBand

* runInBand

* comment test run

* try different jest option

* standardize jest test options

* increase heap size

* remove heap size config

* support scoped packages for cra --scripts-version option

* upgrade jest version

* fix windows

* fix windows again

* jest 23.4.1

* babel-jest

* babel-jest

* split out kitchhensink

* travis node 6

* travis node 6 config

* node 6 travis eject

* cache yarn

* only cache yarn

* remove unrelated changes

* typo
  • Loading branch information
Jack Zhao authored and Timer committed Sep 21, 2018
1 parent 2ed8ecc commit d0ed845
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 77 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"dependencies": {
"@babel/plugin-transform-modules-commonjs": "7.0.0-beta.46",
"@babel/polyfill": "7.0.0-beta.46",
"@babel/register": "7.0.0-beta.46",
"bootstrap": "4.1.0",
"chai": "3.5.0",
"jsdom": "9.8.3",
"mocha": "3.2.0",
"bootstrap": "4.1.1",
"jest": "23.6.0",
"node-sass": "4.8.3",
"normalize.css": "7.0.0",
"prop-types": "15.5.6",
Expand Down
1 change: 0 additions & 1 deletion packages/react-scripts/fixtures/kitchensink/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,3 @@ An usual flow for the test itself is something similar to:

- since `initDOM` returns a `Document` element, the previous `id` attribute is used to target the feature's DOM and `expect` accordingly

These tests are run by **mocha** (why not **jest**? See [this issue](https://github.com/facebook/jest/issues/2288)) and the environments used are both `development` and `production`.
31 changes: 14 additions & 17 deletions packages/react-scripts/fixtures/kitchensink/integration/env.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

import { expect } from 'chai';
import initDOM from './initDOM';

describe('Integration', () => {
Expand All @@ -15,23 +14,23 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-file-env-original-1').textContent
).to.equal('from-original-env-1');
).toBe('from-original-env-1');
expect(
doc.getElementById('feature-file-env-original-2').textContent
).to.equal('override-from-original-local-env-2');
).toBe('override-from-original-local-env-2');

if (process.env.NODE_ENV === 'production') {
expect(doc.getElementById('feature-file-env').textContent).to.equal(
expect(doc.getElementById('feature-file-env').textContent).toBe(
'production'
);
expect(doc.getElementById('feature-file-env-x').textContent).to.equal(
expect(doc.getElementById('feature-file-env-x').textContent).toBe(
'x-from-production-env'
);
} else {
expect(doc.getElementById('feature-file-env').textContent).to.equal(
expect(doc.getElementById('feature-file-env').textContent).toBe(
'development'
);
expect(doc.getElementById('feature-file-env-x').textContent).to.equal(
expect(doc.getElementById('feature-file-env-x').textContent).toBe(
'x-from-development-env'
);
}
Expand All @@ -41,9 +40,7 @@ describe('Integration', () => {
it('NODE_PATH', async () => {
const doc = await initDOM('node-path');

expect(
doc.getElementById('feature-node-path').childElementCount
).to.equal(4);
expect(doc.getElementById('feature-node-path').childElementCount).toBe(4);
doc.defaultView.close();
});

Expand All @@ -54,12 +51,12 @@ describe('Integration', () => {
process.env.NODE_ENV === 'development'
? ''
: 'http://www.example.org/spa';
expect(doc.getElementById('feature-public-url').textContent).to.equal(
expect(doc.getElementById('feature-public-url').textContent).toBe(
`${prefix}.`
);
expect(
doc.querySelector('head link[rel="shortcut icon"]').getAttribute('href')
).to.equal(`${prefix}/favicon.ico`);
).toBe(`${prefix}/favicon.ico`);
doc.defaultView.close();
});

Expand All @@ -68,25 +65,25 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-shell-env-variables').textContent
).to.equal('fromtheshell.');
).toBe('fromtheshell.');
doc.defaultView.close();
});

it('expand .env variables', async () => {
const doc = await initDOM('expand-env-variables');

expect(doc.getElementById('feature-expand-env-1').textContent).to.equal(
expect(doc.getElementById('feature-expand-env-1').textContent).toBe(
'basic'
);
expect(doc.getElementById('feature-expand-env-2').textContent).to.equal(
expect(doc.getElementById('feature-expand-env-2').textContent).toBe(
'basic'
);
expect(doc.getElementById('feature-expand-env-3').textContent).to.equal(
expect(doc.getElementById('feature-expand-env-3').textContent).toBe(
'basic'
);
expect(
doc.getElementById('feature-expand-env-existing').textContent
).to.equal('fromtheshell');
).toBe('fromtheshell');
doc.defaultView.close();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

const fs = require('fs');
const http = require('http');
const jsdom = require('jsdom');
const jsdom = require('jsdom/lib/old-api.js');
const path = require('path');
const { expect } = require('chai');

let getMarkup;
export let resourceLoader;
Expand Down Expand Up @@ -50,7 +49,7 @@ if (process.env.E2E_FILE) {
it.only('can run jsdom (at least one of "E2E_FILE" or "E2E_URL" environment variables must be provided)', () => {
expect(
new Error("This isn't the error you are looking for.")
).to.be.undefined();
).toBeUndefined();
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

import { expect } from 'chai';
import initDOM from './initDOM';

describe('Integration', () => {
Expand All @@ -15,25 +14,25 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-array-destructuring').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

it('array spread', async () => {
const doc = await initDOM('array-spread');

expect(
doc.getElementById('feature-array-spread').childElementCount
).to.equal(4);
expect(doc.getElementById('feature-array-spread').childElementCount).toBe(
4
);
doc.defaultView.close();
});

it('async/await', async () => {
const doc = await initDOM('async-await');

expect(
doc.getElementById('feature-async-await').childElementCount
).to.equal(4);
expect(doc.getElementById('feature-async-await').childElementCount).toBe(
4
);
doc.defaultView.close();
});

Expand All @@ -42,7 +41,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-class-properties').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -51,7 +50,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-computed-properties').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -60,7 +59,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-custom-interpolation').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -69,7 +68,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-default-parameters').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -78,16 +77,16 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-destructuring-and-await').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

it('generators', async () => {
const doc = await initDOM('generators');

expect(
doc.getElementById('feature-generators').childElementCount
).to.equal(4);
expect(doc.getElementById('feature-generators').childElementCount).toBe(
4
);
doc.defaultView.close();
});

Expand All @@ -96,7 +95,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-object-destructuring').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -105,16 +104,14 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-object-spread').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

it('promises', async () => {
const doc = await initDOM('promises');

expect(doc.getElementById('feature-promises').childElementCount).to.equal(
4
);
expect(doc.getElementById('feature-promises').childElementCount).toBe(4);
doc.defaultView.close();
});

Expand All @@ -123,7 +120,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-rest-and-default').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -132,7 +129,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-rest-parameters').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});

Expand All @@ -141,7 +138,7 @@ describe('Integration', () => {

expect(
doc.getElementById('feature-template-interpolation').childElementCount
).to.equal(4);
).toBe(4);
doc.defaultView.close();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

import { expect } from 'chai';
import initDOM, { resourceLoader } from './initDOM';
import url from 'url';

Expand All @@ -20,14 +19,14 @@ const matchCSS = (doc, regexes) => {
}
resourceLoader({ url: url.parse(href) }, (_, textContent) => {
for (const regex of regexes) {
expect(textContent).to.match(regex);
expect(textContent).toMatch(regex);
}
});
} else {
for (let i = 0; i < regexes.length; ++i) {
expect(
doc.getElementsByTagName('style')[i].textContent.replace(/\s/g, '')
).to.match(regexes[i]);
).toMatch(regexes[i]);
}
}
};
Expand Down Expand Up @@ -87,7 +86,7 @@ describe('Integration', () => {
const children = doc.getElementById('graphql-inclusion').children;

// .graphql
expect(children[0].textContent.replace(/\s/g, '')).to.equal(
expect(children[0].textContent.replace(/\s/g, '')).toBe(
'{"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","variableDefinitions":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"test"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"test"},"value":{"kind":"StringValue","value":"test","block":false}}],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"test"},"arguments":[],"directives":[]}]}}]}}],"loc":{"start":0,"end":40,"source":{"body":"{\\ntest(test:\\"test\\"){\\ntest\\n}\\n}\\n","name":"GraphQLrequest","locationOffset":{"line":1,"column":1}}}}'
);
doc.defaultView.close();
Expand All @@ -96,7 +95,7 @@ describe('Integration', () => {
it('image inclusion', async () => {
const doc = await initDOM('image-inclusion');

expect(doc.getElementById('feature-image-inclusion').src).to.match(
expect(doc.getElementById('feature-image-inclusion').src).toMatch(
/^data:image\/jpeg;base64.+==$/
);
doc.defaultView.close();
Expand All @@ -105,7 +104,7 @@ describe('Integration', () => {
it('no ext inclusion', async () => {
const doc = await initDOM('no-ext-inclusion');

expect(doc.getElementById('feature-no-ext-inclusion').href).to.match(
expect(doc.getElementById('feature-no-ext-inclusion').href).toMatch(
/\/static\/media\/aFileWithoutExt\.[a-f0-9]{8}\.bin$/
);
doc.defaultView.close();
Expand All @@ -114,7 +113,7 @@ describe('Integration', () => {
it('json inclusion', async () => {
const doc = await initDOM('json-inclusion');

expect(doc.getElementById('feature-json-inclusion').textContent).to.equal(
expect(doc.getElementById('feature-json-inclusion').textContent).toBe(
'This is an abstract.'
);
doc.defaultView.close();
Expand All @@ -123,15 +122,15 @@ describe('Integration', () => {
it('linked modules', async () => {
const doc = await initDOM('linked-modules');

expect(doc.getElementById('feature-linked-modules').textContent).to.equal(
expect(doc.getElementById('feature-linked-modules').textContent).toBe(
'2.0.0'
);
doc.defaultView.close();
});

it('svg inclusion', async () => {
const doc = await initDOM('svg-inclusion');
expect(doc.getElementById('feature-svg-inclusion').src).to.match(
expect(doc.getElementById('feature-svg-inclusion').src).toMatch(
/\/static\/media\/logo\..+\.svg$/
);
doc.defaultView.close();
Expand All @@ -140,9 +139,7 @@ describe('Integration', () => {
it('svg component', async () => {
const doc = await initDOM('svg-component');

expect(doc.getElementById('feature-svg-component').textContent).to.equal(
''
);
expect(doc.getElementById('feature-svg-component').textContent).toBe('');
doc.defaultView.close();
});

Expand All @@ -155,7 +152,7 @@ describe('Integration', () => {
it('unknown ext inclusion', async () => {
const doc = await initDOM('unknown-ext-inclusion');

expect(doc.getElementById('feature-unknown-ext-inclusion').href).to.match(
expect(doc.getElementById('feature-unknown-ext-inclusion').href).toMatch(
/\/static\/media\/aFileWithExt\.[a-f0-9]{8}\.unknown$/
);
doc.defaultView.close();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
testEnvironment: 'node',
testMatch: ['**/integration/*.test.js'],
};
Loading

0 comments on commit d0ed845

Please sign in to comment.