Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4209 from vector-im/dbkr/ilag_fix_tests

Browse Source 
Fix Tests in ILAG
This commit is contained in:
Luke Barnard 2017-06-06 16:20:14 +01:00 committed by GitHub
commit 8fee4941c3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/app-tests/joining.js
View File

@ -163,6 +163,13 @@ describe('joining a room', function () {
}).then(() => {
// wait for the join request to be made
return q.delay(1);
}).then(() => {
// and again, because the state update has to go to the store and
// then one dispatch within the store, then to the view
// XXX: This is *super flaky*: a better way would be to declare
// that we expect a certain state transition to happen, then wait
// for that transition to occur.
return q.delay(1);
}).then(() => {
// the roomview should now be loading
expect(roomView.state.room).toBe(null);
@ -177,6 +184,8 @@ describe('joining a room', function () {
}).then(() => {
httpBackend.verifyNoOutstandingExpectation();
return q.delay(1);
}).then(() => {
// We've joined, expect this to false
expect(roomView.state.joining).toBe(false);

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

@ -192,13 +192,15 @@ describe('loading:', function () {
}).respond(403, "Guest access is disabled");
return httpBackend.flush();
}).then(() => {
// Wait for another trip around the event loop for the UI to update
return q.delay(1);
}).then(() => {
// we expect a single <Login> component following session load
ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.login.Login'));
expect(windowLocation.hash).toEqual("");
done();
});
}).done(done, done);
});
it('should follow the original link after successful login', function(done) {