Skip to content

Commit 585d286

Browse files
committed
Fix loading tests for welcome page
1 parent 6aff746 commit 585d286

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

test/app-tests/loading.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,7 @@ describe('loading:', function() {
397397
});
398398

399399
describe('Guest auto-registration:', function() {
400-
// TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
401-
/* it('shows a welcome page by default', function(done) {
400+
it('shows a welcome page by default', function(done) {
402401
loadApp();
403402

404403
Promise.delay(1).then(() => {
@@ -426,10 +425,9 @@ describe('loading:', function() {
426425
matrixChat, sdk.getComponent('auth.Welcome'));
427426
expect(windowLocation.hash).toEqual("#/welcome");
428427
}).done(done, done);
429-
}); */
428+
});
430429

431-
// TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
432-
/* it('uses the default homeserver to register with', function(done) {
430+
it('uses the default homeserver to register with', function(done) {
433431
loadApp();
434432

435433
Promise.delay(1).then(() => {
@@ -453,15 +451,15 @@ describe('loading:', function() {
453451
}).then((req) => {
454452
expect(req.path).toStartWith(DEFAULT_HS_URL);
455453

456-
// once the sync completes, we should have a home page
454+
// once the sync completes, we should have a welcome page
457455
httpBackend.verifyNoOutstandingExpectation();
458456
ReactTestUtils.findRenderedComponentWithType(
459-
matrixChat, sdk.getComponent('structures.EmbeddedPage'));
460-
expect(windowLocation.hash).toEqual("#/home");
457+
matrixChat, sdk.getComponent('auth.Welcome'));
458+
expect(windowLocation.hash).toEqual("#/welcome");
461459
expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
462460
expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
463461
}).done(done, done);
464-
}); */
462+
});
465463

466464
it('shows a room view if we followed a room link', function(done) {
467465
loadApp({
@@ -530,15 +528,14 @@ describe('loading:', function() {
530528
});
531529
});
532530

533-
// TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
534-
/* it('should give us a login page', function() {
531+
it('should give us a login page', function() {
535532
expect(windowLocation.hash).toEqual("#/login");
536533

537534
// we expect a single <Login> component
538535
ReactTestUtils.findRenderedComponentWithType(
539536
matrixChat, sdk.getComponent('structures.auth.Login'),
540537
);
541-
}); */
538+
});
542539

543540
/*
544541
// ILAG renders this obsolete. I think.
@@ -680,8 +677,6 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
680677

681678
console.log(Date.now() + " Awaiting sync spinner: load complete.");
682679

683-
// state looks good, check the rendered output
684-
assertAtSyncingSpinner(matrixChat);
685680
return Promise.resolve();
686681
}
687682

0 commit comments

Comments
 (0)