gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-07-13 10:58:24 +00:00
parent acbcde85ce a303e1e1b8
commit 9072ff93b9
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -48,7 +48,7 @@
"lintall": "eslint src/ test/", "lintall": "eslint src/ test/",
"clean": "rimraf lib webapp electron_app/dist", "clean": "rimraf lib webapp electron_app/dist",
"prepublish": "npm run build:compile", "prepublish": "npm run build:compile",
"test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless --colors=false", "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless",
"test-multi": "karma start" "test-multi": "karma start"
}, },
"dependencies": { "dependencies": {
@ -121,6 +121,7 @@
"karma-mocha": "^0.2.2", "karma-mocha": "^0.2.2",
"karma-webpack": "^1.7.0", "karma-webpack": "^1.7.0",
"matrix-mock-request": "^1.0.0", "matrix-mock-request": "^1.0.0",
"matrix-react-test-utils": "^0.2.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"mocha": "^2.4.5", "mocha": "^2.4.5",

19
test/app-tests/loading.js
View File

@ -23,6 +23,7 @@ import ReactDOM from 'react-dom';
import ReactTestUtils from 'react-addons-test-utils'; import ReactTestUtils from 'react-addons-test-utils';
import expect from 'expect'; import expect from 'expect';
import q from 'q'; import q from 'q';
import MatrixReactTestUtils from 'matrix-react-test-utils';
import jssdk from 'matrix-js-sdk'; import jssdk from 'matrix-js-sdk';
@ -183,11 +184,8 @@ describe('loading:', function () {
return httpBackend.flush(); return httpBackend.flush();
}).then(() => { }).then(() => {
// Wait for another trip around the event loop for the UI to update // Wait for another trip around the event loop for the UI to update
return q.delay(10); return awaitLoginComponent(matrixChat);
}).then(() => { }).then(() => {
// we expect a single <Login> component following session load
ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.login.Login'));
expect(windowLocation.hash).toEqual("#/login"); expect(windowLocation.hash).toEqual("#/login");
}).done(done, done); }).done(done, done);
}); });
@ -232,7 +230,7 @@ describe('loading:', function () {
uriFragment: "#/login", uriFragment: "#/login",
}); });
return q.delay(100).then(() => { return awaitLoginComponent(matrixChat).then(() => {
// we expect a single <Login> component // we expect a single <Login> component
ReactTestUtils.findRenderedComponentWithType( ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.login.Login')); matrixChat, sdk.getComponent('structures.login.Login'));
@ -366,7 +364,7 @@ describe('loading:', function () {
}); });
// give the UI a chance to display // give the UI a chance to display
return q.delay(50); return awaitLoginComponent(matrixChat);
}); });
it('shows a login view', function() { it('shows a login view', function() {
@ -530,7 +528,7 @@ describe('loading:', function () {
dis.dispatch({ action: 'start_login' }); dis.dispatch({ action: 'start_login' });
return q.delay(1); return awaitLoginComponent(matrixChat);
}); });
}); });
@ -607,7 +605,6 @@ describe('loading:', function () {
}); });
}); });
// check that we have a Login component, send a 'user:pass' login, // check that we have a Login component, send a 'user:pass' login,
// and await the HTTP requests. // and await the HTTP requests.
function completeLogin(matrixChat) { function completeLogin(matrixChat) {
@ -723,3 +720,9 @@ function awaitRoomView(matrixChat, retryLimit, retryCount) {
matrixChat, sdk.getComponent('structures.RoomView')); matrixChat, sdk.getComponent('structures.RoomView'));
return q(); return q();
} }
function awaitLoginComponent(matrixChat, attempts) {
return MatrixReactTestUtils.waitForRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.login.Login'), attempts,
);
}