Skip to content

Commit 944f8bf

Browse files
authored
Merge pull request #1624 from fippo/jest
test: port to jest
2 parents 77d2b2a + 03ad929 commit 944f8bf

File tree

25 files changed

+89
-109
lines changed

25 files changed

+89
-109
lines changed

.babelrc

Lines changed: 0 additions & 8 deletions
This file was deleted.

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module.exports = {
88
'browser': true,
99
'es6': true,
1010
'node': true,
11+
'jest': true
1112
},
1213
'rules': {
1314
'max-len': 'off',
@@ -42,4 +43,5 @@ module.exports = {
4243
"VideoEncoder": true,
4344
"VideoDecoder": true,
4445
},
46+
"plugins": ["jest"]
4547
};

.github/workflows/interop-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
- run: BROWSER=${{matrix.browserA}} BVER=${{matrix.bver}} ./node_modules/travis-multirunner/setup.sh
1919
- run: BROWSER=${{matrix.browserB}} BVER=${{matrix.bver}} ./node_modules/travis-multirunner/setup.sh
2020
- run: Xvfb :99 &
21-
- run: BROWSER_A=${{matrix.browserA}} BROWSER_B=${{matrix.browserB}} BVER=${{matrix.bver}} DISPLAY=:99.0 node_modules/.bin/mocha --retries=3 test/interop/connection.js
21+
- run: BROWSER_A=${{matrix.browserA}} BROWSER_B=${{matrix.browserB}} BVER=${{matrix.bver}} DISPLAY=:99.0 node_modules/.bin/jest --retries=3 test/interop/connection.js

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
- run: npm install
2626
- run: BROWSER=${{matrix.browser}} BVER=${{matrix.version}} ./node_modules/travis-multirunner/setup.sh
2727
- run: Xvfb :99 &
28-
- run: BROWSER=${{matrix.browser}} BVER=${{matrix.version}} DISPLAY=:99.0 npm run mocha -- --retries=3
28+
- run: BROWSER=${{matrix.browser}} BVER=${{matrix.version}} DISPLAY=:99.0 npm run jest -- --retries=3

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
"start": "http-server . -c-1",
2323
"test": "npm run eslint && npm run stylelint",
2424
"eslint": "eslint 'test/**.js' 'src/content/**/*.js'",
25-
"mocha": "mocha --timeout 5000 'src/content/**/test.js'",
25+
"jest": "jest --testTimeout 5000 --maxWorkers=1 'src/content/**/test.js'",
2626
"stylelint": "stylelint 'src/**/*.css'"
2727
},
2828
"eslintIgnore": [
2929
"'**/third_party/*.js'"
3030
],
3131
"devDependencies": {
32-
"chai": "^4.3.6",
3332
"chromedriver": ">98.0.1",
3433
"eslint": "^8.9.0",
3534
"eslint-config-google": "^0.14.0",
35+
"eslint-plugin-jest": "^27.4.0",
3636
"geckodriver": "^3.0.1",
3737
"http-server": "^14.1.0",
38-
"mocha": "^9.2.1",
38+
"jest": "^29.7.0",
3939
"selenium-webdriver": "^4.12.0",
4040
"stylelint": "^14.5.3",
4141
"stylelint-config-recommended": "^7.0.0",

src/content/datachannel/basic/js/test.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,18 @@
55
* that can be found in the LICENSE file in the root of the source
66
* tree.
77
*/
8-
/* eslint-env node, mocha */
9-
10-
'use strict';
118
const webdriver = require('selenium-webdriver');
129
const seleniumHelpers = require('../../../../../test/webdriver');
13-
const {expect} = require('chai');
1410

1511
let driver;
1612
const path = '/src/content/datachannel/basic/index.html';
1713
const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
1814

1915
describe('datachannel basic', () => {
20-
before(() => {
16+
beforeAll(() => {
2117
driver = seleniumHelpers.buildDriver();
2218
});
23-
after(() => {
19+
afterAll(() => {
2420
return driver.quit();
2521
});
2622

@@ -50,6 +46,6 @@ describe('datachannel basic', () => {
5046
}));
5147

5248
const value = await driver.findElement(webdriver.By.id('dataChannelReceive')).getAttribute('value');
53-
expect(value).to.equal(text);
49+
expect(value).toBe(text);
5450
});
5551
});

src/content/datachannel/channel/js/test.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
* that can be found in the LICENSE file in the root of the source
66
* tree.
77
*/
8-
/* eslint-env node, mocha */
8+
/* eslint-env node */
99

1010
'use strict';
1111
const webdriver = require('selenium-webdriver');
1212
const seleniumHelpers = require('../../../../../test/webdriver');
13-
const {expect} = require('chai');
1413

1514
let driver;
1615
const path = '/src/content/datachannel/channel/index.html';
1716
const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
1817

1918
describe('datachannel and broadcast channels', () => {
20-
before(() => {
19+
beforeAll(() => {
2120
driver = seleniumHelpers.buildDriver();
2221
});
23-
after(() => {
22+
afterAll(() => {
2423
return driver.quit();
2524
});
2625

@@ -68,7 +67,7 @@ describe('datachannel and broadcast channels', () => {
6867
return document.getElementById('dataChannelReceive').value.length > 0;
6968
}));
7069
const fromFirst= await driver.findElement(webdriver.By.id('dataChannelReceive')).getAttribute('value');
71-
expect(fromFirst).to.equal(firstHello);
70+
expect(fromFirst).toBe(firstHello);
7271

7372
// Send a message from the second tab to the first tab.
7473
await driver.switchTo().window(secondTab);
@@ -84,7 +83,7 @@ describe('datachannel and broadcast channels', () => {
8483
return document.getElementById('dataChannelReceive').value.length > 0;
8584
}));
8685
const fromSecond = await driver.findElement(webdriver.By.id('dataChannelReceive')).getAttribute('value');
87-
expect(fromSecond).to.equal(secondHello);
86+
expect(fromSecond).toBe(secondHello);
8887
});
8988
});
9089

src/content/datachannel/datatransfer/js/test.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
* that can be found in the LICENSE file in the root of the source
66
* tree.
77
*/
8-
/* eslint-env node, mocha */
8+
/* eslint-env node */
99

1010
'use strict';
1111
const webdriver = require('selenium-webdriver');
1212
const seleniumHelpers = require('../../../../../test/webdriver');
13-
const {expect} = require('chai');
1413

1514
let driver;
1615
const path = '/src/content/datachannel/datatransfer/index.html';
1716
const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
1817

1918
describe('datachannel datatransfer', () => {
20-
before(() => {
19+
beforeAll(() => {
2120
driver = seleniumHelpers.buildDriver();
2221
});
23-
after(() => {
22+
afterAll(() => {
2423
return driver.quit();
2524
});
2625

@@ -52,6 +51,6 @@ describe('datachannel datatransfer', () => {
5251
}));
5352

5453
const transferred = await driver.findElement(webdriver.By.id('receiveProgress')).getAttribute('value');
55-
expect(transferred >>> 0).to.equal(megsToSend * 1024 * 1024);
54+
expect(transferred >>> 0).toBe(megsToSend * 1024 * 1024);
5655
});
5756
});

src/content/datachannel/filetransfer/js/test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* that can be found in the LICENSE file in the root of the source
66
* tree.
77
*/
8-
/* eslint-env node, mocha */
8+
/* eslint-env node */
99

1010
'use strict';
1111
const webdriver = require('selenium-webdriver');
@@ -16,10 +16,10 @@ const path = '/src/content/datachannel/filetransfer/index.html';
1616
const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
1717

1818
describe('datachannel filetransfer', () => {
19-
before(() => {
19+
beforeAll(() => {
2020
driver = seleniumHelpers.buildDriver();
2121
});
22-
after(() => {
22+
afterAll(() => {
2323
return driver.quit();
2424
});
2525

src/content/devices/input-output/js/test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* that can be found in the LICENSE file in the root of the source
66
* tree.
77
*/
8-
/* eslint-env node, mocha */
8+
/* eslint-env node */
99
'use strict';
1010

1111
const seleniumHelpers = require('../../../../../test/webdriver');
@@ -15,10 +15,10 @@ const path = '/src/content/devices/input-output/index.html';
1515
const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
1616

1717
describe('input-output', () => {
18-
before(() => {
18+
beforeAll(() => {
1919
driver = seleniumHelpers.buildDriver();
2020
});
21-
after(() => {
21+
afterAll(() => {
2222
return driver.quit();
2323
});
2424

0 commit comments

Comments
 (0)