From 50baa09f5e7251049cebc336165a98c45a53c041 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 11 Feb 2019 10:06:44 +0000 Subject: [PATCH 1/3] Revert "Disable even more tests" This was only done because CI was missing matrix-org/matrix-react-sdk@5977859dd98960189e65f34abc2832d281ec48de. This reverts commit e55ceef9055a82f9dcf706dc92db856ce4dadb5f. --- test/app-tests/loading.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js index b165e5d3c2e..060c8f8ad6c 100644 --- a/test/app-tests/loading.js +++ b/test/app-tests/loading.js @@ -222,8 +222,7 @@ describe('loading:', function() { }).done(done, done); }); - // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 - /* it('should follow the original link after successful login', function(done) { + it('should follow the original link after successful login', function(done) { loadApp({ uriFragment: "#/room/!room:id", }); @@ -258,10 +257,9 @@ describe('loading:', function() { expect(localStorage.getItem('mx_hs_url')).toEqual(DEFAULT_HS_URL); expect(localStorage.getItem('mx_is_url')).toEqual(DEFAULT_IS_URL); }).done(done, done); - }); */ + }); - // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 - /* it('should not register as a guest when using a #/login link', function() { + it('should not register as a guest when using a #/login link', function() { loadApp({ uriFragment: "#/login", }); @@ -288,7 +286,7 @@ describe('loading:', function() { matrixChat, sdk.getComponent('structures.EmbeddedPage')); expect(windowLocation.hash).toEqual("#/home"); }); - }); */ + }); }); describe("MatrixClient rehydrated from stored credentials:", function() { @@ -300,8 +298,7 @@ describe('loading:', function() { localStorage.setItem("mx_last_room_id", "!last_room:id"); }); - // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 - /* it('shows the last known room by default', function() { + it('shows the last known room by default', function() { httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); @@ -357,7 +354,7 @@ describe('loading:', function() { httpBackend.verifyNoOutstandingExpectation(); expect(windowLocation.hash).toEqual("#/room/!room:id"); }).done(done, done); - }); */ + }); describe('/#/login link:', function() { beforeEach(function() { @@ -387,8 +384,7 @@ describe('loading:', function() { } }); - // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468 - /* it('shows the homepage after login', function() { + it('shows the homepage after login', function() { return completeLogin(matrixChat).then(() => { // we should see a home page, even though we previously had // a stored mx_last_room_id @@ -396,7 +392,7 @@ describe('loading:', function() { matrixChat, sdk.getComponent('structures.EmbeddedPage')); expect(windowLocation.hash).toEqual("#/home"); }); - }); */ + }); }); }); From 6aff7460feaa76e9fa5c4b2190f8bef95d99da8f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 11 Feb 2019 11:17:40 +0000 Subject: [PATCH 2/3] Map welcome page in Karma for less 404s --- karma.conf.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index d982aa24218..ae666a455bf 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -78,7 +78,7 @@ module.exports = function (config) { watched: false, included: false, served: true, nocache: false, }, { - pattern: 'res/themes/**', + pattern: 'res/**', watched: false, included: false, served: true, nocache: false, }, ], @@ -87,6 +87,8 @@ module.exports = function (config) { // redirect img links to the karma server. See above. "/img/": "/base/node_modules/matrix-react-sdk/res/img/", "/themes/": "/base/res/themes/", + "/welcome.html": "/base/res/welcome.html", + "/welcome/": "/base/res/welcome/", }, // preprocess matching files before serving them to the browser From 585d28692dc37b1228c57219c9a24601b39f2056 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 11 Feb 2019 15:18:29 +0000 Subject: [PATCH 3/3] Fix loading tests for welcome page --- test/app-tests/loading.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js index 060c8f8ad6c..aa7fe58fa24 100644 --- a/test/app-tests/loading.js +++ b/test/app-tests/loading.js @@ -397,8 +397,7 @@ describe('loading:', 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(); Promise.delay(1).then(() => { @@ -426,10 +425,9 @@ describe('loading:', function() { matrixChat, sdk.getComponent('auth.Welcome')); expect(windowLocation.hash).toEqual("#/welcome"); }).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(); Promise.delay(1).then(() => { @@ -453,15 +451,15 @@ describe('loading:', function() { }).then((req) => { 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(); ReactTestUtils.findRenderedComponentWithType( - matrixChat, sdk.getComponent('structures.EmbeddedPage')); - expect(windowLocation.hash).toEqual("#/home"); + matrixChat, sdk.getComponent('auth.Welcome')); + expect(windowLocation.hash).toEqual("#/welcome"); expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL); expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL); }).done(done, done); - }); */ + }); it('shows a room view if we followed a room link', function(done) { 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"); // we expect a single component ReactTestUtils.findRenderedComponentWithType( matrixChat, sdk.getComponent('structures.auth.Login'), ); - }); */ + }); /* // ILAG renders this obsolete. I think. @@ -680,8 +677,6 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) { console.log(Date.now() + " Awaiting sync spinner: load complete."); - // state looks good, check the rendered output - assertAtSyncingSpinner(matrixChat); return Promise.resolve(); }