OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

wait additional tick

pull/21833/head
Michael Telatynski 2019-12-17 12:42:47 +00:00
parent bcba9a3e50
commit 409a111b02
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -157,7 +157,7 @@
"webpack-cli": "^3.1.1" "webpack-cli": "^3.1.1"
}, },
"jest": { "jest": {
"testMatch": ["**/*-test.js"], "testMatch": ["test/**/*-test.js"],
"setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js", "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
"moduleNameMapper": { "moduleNameMapper": {
"\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js" "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"

2
test/components/structures/GroupView-test.js
View File

@ -302,7 +302,7 @@ describe('GroupView', function() {
it('should show a RoomDetailList after a successful /summary & /rooms (no rooms returned)', function() { it('should show a RoomDetailList after a successful /summary & /rooms (no rooms returned)', function() {
const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView); const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
const prom = waitForUpdate(groupView, 4).then(() => { const prom = waitForUpdate(groupView, 5).then(() => {
const roomDetailList = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_RoomDetailList'); const roomDetailList = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_RoomDetailList');
const roomDetailListElement = ReactDOM.findDOMNode(roomDetailList); const roomDetailListElement = ReactDOM.findDOMNode(roomDetailList);
expect(roomDetailListElement).toBeTruthy(); expect(roomDetailListElement).toBeTruthy();

1
test/utils/MegolmExportEncryption-test.js
View File

@ -74,7 +74,6 @@ describe('MegolmExportEncryption', function() {
let MegolmExportEncryption; let MegolmExportEncryption;
beforeAll(() => { beforeAll(() => {
// window.crypto = { subtle: crypto.subtle, getRandomValues };
window.crypto = { subtle: webCrypto.subtle, getRandomValues }; window.crypto = { subtle: webCrypto.subtle, getRandomValues };
MegolmExportEncryption = require("../../src/utils/MegolmExportEncryption"); MegolmExportEncryption = require("../../src/utils/MegolmExportEncryption");
}); });