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

Fix loading tests for welcome page

This commit is contained in:
J. Ryan Stinnett 2019-02-11 15:18:29 +00:00
parent 6aff7460fe
commit 585d28692d
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,8 +397,7 @@ describe('loading:', function() {
}); });
describe('Guest auto-registration:', function() { describe('Guest auto-registration:', function() {
// TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 it('shows a welcome page by default', function(done) {
/* it('shows a welcome page by default', function(done) {
loadApp(); loadApp();
Promise.delay(1).then(() => { Promise.delay(1).then(() => {
@ -426,10 +425,9 @@ describe('loading:', function() {
matrixChat, sdk.getComponent('auth.Welcome')); matrixChat, sdk.getComponent('auth.Welcome'));
expect(windowLocation.hash).toEqual("#/welcome"); expect(windowLocation.hash).toEqual("#/welcome");
}).done(done, done); }).done(done, done);
}); */ });
// TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 it('uses the default homeserver to register with', function(done) {
/* it('uses the default homeserver to register with', function(done) {
loadApp(); loadApp();
Promise.delay(1).then(() => { Promise.delay(1).then(() => {
@ -453,15 +451,15 @@ describe('loading:', function() {
}).then((req) => { }).then((req) => {
expect(req.path).toStartWith(DEFAULT_HS_URL); expect(req.path).toStartWith(DEFAULT_HS_URL);
// once the sync completes, we should have a home page // once the sync completes, we should have a welcome page
httpBackend.verifyNoOutstandingExpectation(); httpBackend.verifyNoOutstandingExpectation();
ReactTestUtils.findRenderedComponentWithType( ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.EmbeddedPage')); matrixChat, sdk.getComponent('auth.Welcome'));
expect(windowLocation.hash).toEqual("#/home"); expect(windowLocation.hash).toEqual("#/welcome");
expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL); expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL); expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
}).done(done, done); }).done(done, done);
}); */ });
it('shows a room view if we followed a room link', function(done) { it('shows a room view if we followed a room link', function(done) {
loadApp({ loadApp({
@ -530,15 +528,14 @@ describe('loading:', function() {
}); });
}); });
// TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 it('should give us a login page', function() {
/* it('should give us a login page', function() {
expect(windowLocation.hash).toEqual("#/login"); expect(windowLocation.hash).toEqual("#/login");
// we expect a single <Login> component // we expect a single <Login> component
ReactTestUtils.findRenderedComponentWithType( ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.auth.Login'), matrixChat, sdk.getComponent('structures.auth.Login'),
); );
}); */ });
/* /*
// ILAG renders this obsolete. I think. // ILAG renders this obsolete. I think.
@ -680,8 +677,6 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
console.log(Date.now() + " Awaiting sync spinner: load complete."); console.log(Date.now() + " Awaiting sync spinner: load complete.");
// state looks good, check the rendered output
assertAtSyncingSpinner(matrixChat);
return Promise.resolve(); return Promise.resolve();
} }