PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

do accepting terms as part of signup since we try to create a room with riot-bot after login, which fails with consent warning

Browse source
This commit is contained in:
Bruno Windels 2018-07-17 12:38:20 +02:00
parent 83eebfdecc
commit fc4c425a22
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/join.js
View file

@ -17,7 +17,7 @@ limitations under the License.
const helpers = require('../helpers'); const helpers = require('../helpers');
const assert = require('assert'); const assert = require('assert');
module.exports = async function join(page, roomName, acceptTerms = false) { module.exports = async function join(page, roomName) {
//TODO: brittle selector //TODO: brittle selector
const directoryButton = await helpers.waitAndQuerySelector(page, '.mx_RoleButton[aria-label="Room directory"]'); const directoryButton = await helpers.waitAndQuerySelector(page, '.mx_RoleButton[aria-label="Room directory"]');
await directoryButton.click(); await directoryButton.click();
@ -31,21 +31,5 @@ module.exports = async function join(page, roomName, acceptTerms = false) {
const joinLink = await helpers.waitAndQuerySelector(page, '.mx_RoomPreviewBar_join_text a'); const joinLink = await helpers.waitAndQuerySelector(page, '.mx_RoomPreviewBar_join_text a');
await joinLink.click(); await joinLink.click();
if (acceptTerms) {
const reviewTermsButton = await helpers.waitAndQuerySelector(page, '.mx_QuestionDialog button.mx_Dialog_primary');
const termsPagePromise = helpers.waitForNewPage();
await reviewTermsButton.click();
const termsPage = await termsPagePromise;
const acceptButton = await termsPage.$('input[type=submit]');
await acceptButton.click();
await helpers.delay(500); //TODO yuck, timers
//try to join again after accepting the terms
//TODO need to do this because joinLink is detached after switching target
const joinLink2 = await helpers.waitAndQuerySelector(page, '.mx_RoomPreviewBar_join_text a');
await joinLink2.click();
}
await page.waitForSelector('.mx_MessageComposer'); await page.waitForSelector('.mx_MessageComposer');
} }

13
tests/signup.js
View file

@ -57,7 +57,6 @@ module.exports = async function signup(page, username, password, homeserver) {
await continueButton.click(); await continueButton.click();
//wait for registration to finish so the hash gets set //wait for registration to finish so the hash gets set
//onhashchange better? //onhashchange better?
await helpers.delay(1000);
/* /*
await page.screenshot({path: "afterlogin.png", fullPage: true}); await page.screenshot({path: "afterlogin.png", fullPage: true});
console.log('browser console logs:'); console.log('browser console logs:');
@ -66,11 +65,23 @@ module.exports = async function signup(page, username, password, homeserver) {
console.log(xhrLogs.logs()); console.log(xhrLogs.logs());
*/ */
await acceptTerms(page);
await helpers.delay(10000);
//printElements('page', await page.$('#matrixchat')); //printElements('page', await page.$('#matrixchat'));
// await navigation_promise; // await navigation_promise;
//await page.waitForSelector('.mx_MatrixChat', {visible: true, timeout: 3000}); //await page.waitForSelector('.mx_MatrixChat', {visible: true, timeout: 3000});
const url = page.url(); const url = page.url();
assert.strictEqual(url, helpers.riotUrl('/#/home')); assert.strictEqual(url, helpers.riotUrl('/#/home'));
}
async function acceptTerms(page) {
const reviewTermsButton = await helpers.waitAndQuerySelector(page, '.mx_QuestionDialog button.mx_Dialog_primary');
const termsPagePromise = helpers.waitForNewPage();
await reviewTermsButton.click();
const termsPage = await termsPagePromise;
const acceptButton = await termsPage.$('input[type=submit]');
await acceptButton.click();
await helpers.delay(500); //TODO yuck, timers
} }