Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Repair app loading tests after welcome page #8525

Merged
merged 3 commits into from
Feb 12, 2019
Merged

Repair app loading tests after welcome page #8525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50baa09
Revert "Disable even more tests"
jryans Feb 11, 2019
6aff746
Map welcome page in Karma for less 404s
jryans Feb 11, 2019
585d286
Fix loading tests for welcome page
jryans Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
],
Expand All @@ -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
Expand Down
43 changes: 17 additions & 26 deletions test/app-tests/loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
});
Expand Down Expand Up @@ -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",
});
Expand All @@ -288,7 +286,7 @@ describe('loading:', function() {
matrixChat, sdk.getComponent('structures.EmbeddedPage'));
expect(windowLocation.hash).toEqual("#/home");
});
}); */
});
});

describe("MatrixClient rehydrated from stored credentials:", function() {
Expand All @@ -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' });

Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -387,22 +384,20 @@ 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
ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.EmbeddedPage'));
expect(windowLocation.hash).toEqual("#/home");
});
}); */
});
});
});

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(() => {
Expand Down Expand Up @@ -430,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(() => {
Expand All @@ -457,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({
Expand Down Expand Up @@ -534,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 <Login> component
ReactTestUtils.findRenderedComponentWithType(
matrixChat, sdk.getComponent('structures.auth.Login'),
);
}); */
});

/*
// ILAG renders this obsolete. I think.
Expand Down Expand Up @@ -684,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();
}

Expand Down