From 6cc7fa3a364b76155a25bd164a0515fa47c1ed32 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 30 May 2017 12:55:50 +0100 Subject: [PATCH] Expect a HomePage now instead of a directory, because one is now shown by default --- test/app-tests/loading.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js index 86fad11866..484b1dc2db 100644 --- a/test/app-tests/loading.js +++ b/test/app-tests/loading.js @@ -273,7 +273,7 @@ describe('loading:', function () { localStorage.setItem("mx_user_id", "@me:localhost"); }); - it('shows a directory by default if we have no joined rooms', function(done) { + it('shows a home page by default if we have no joined rooms', function(done) { httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); @@ -283,11 +283,11 @@ describe('loading:', function () { // we got a sync spinner - let the sync complete return expectAndAwaitSync(); }).then(() => { - // once the sync completes, we should have a directory + // once the sync completes, we should have a home page httpBackend.verifyNoOutstandingExpectation(); ReactTestUtils.findRenderedComponentWithType( - matrixChat, sdk.getComponent('structures.RoomDirectory')); - expect(windowLocation.hash).toEqual("#/directory"); + matrixChat, sdk.getComponent('structures.HomePage')); + expect(windowLocation.hash).toEqual("#/home"); }).done(done, done); }); @@ -314,7 +314,7 @@ describe('loading:', function () { }); describe('Guest auto-registration:', function() { - it('shows a directory by default', function (done) { + it('shows a home page by default', function (done) { loadApp(); q.delay(1).then(() => { @@ -336,11 +336,11 @@ describe('loading:', function () { // we got a sync spinner - let the sync complete return expectAndAwaitSync(); }).then(() => { - // once the sync completes, we should have a directory + // once the sync completes, we should have a home page httpBackend.verifyNoOutstandingExpectation(); ReactTestUtils.findRenderedComponentWithType( - matrixChat, sdk.getComponent('structures.RoomDirectory')); - expect(windowLocation.hash).toEqual("#/directory"); + matrixChat, sdk.getComponent('structures.HomePage')); + expect(windowLocation.hash).toEqual("#/home"); }).done(done, done); }); @@ -371,11 +371,11 @@ describe('loading:', function () { }).then((req) => { expect(req.path).toMatch(new RegExp("^https://homeserver/")); - // once the sync completes, we should have a directory + // once the sync completes, we should have a home page httpBackend.verifyNoOutstandingExpectation(); ReactTestUtils.findRenderedComponentWithType( - matrixChat, sdk.getComponent('structures.RoomDirectory')); - expect(windowLocation.hash).toEqual("#/directory"); + matrixChat, sdk.getComponent('structures.HomePage')); + expect(windowLocation.hash).toEqual("#/home"); expect(MatrixClientPeg.get().baseUrl).toEqual("https://homeserver"); expect(MatrixClientPeg.get().idBaseUrl).toEqual("https://idserver"); }).done(done, done);