This commit is contained in:
Bruno Windels 2019-10-09 17:51:50 +02:00
parent 3e971e4880
commit 2d848bba29
25 changed files with 84 additions and 100 deletions

View file

@ -14,9 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
const assert = require('assert');
const {acceptDialogMaybe} = require('./dialog');
module.exports = async function acceptInvite(session, name) {
session.log.step(`accepts "${name}" invite`);
//TODO: brittle selector
@ -35,4 +32,4 @@ module.exports = async function acceptInvite(session, name) {
await acceptInvitationLink.click();
session.log.done();
}
};

View file

@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
const assert = require('assert');
async function openRoomDirectory(session) {
const roomDirectoryButton = await session.query('.mx_LeftPanel_explore .mx_AccessibleButton');
await roomDirectoryButton.click();

View file

@ -33,7 +33,7 @@ async function acceptDialogMaybe(session, expectedTitle) {
let primaryButton = null;
try {
primaryButton = await session.query(".mx_Dialog .mx_Dialog_primary");
} catch(err) {
} catch (err) {
return false;
}
if (expectedTitle) {

View file

@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
const assert = require('assert');
module.exports = async function invite(session, userId) {
session.log.step(`invites "${userId}" to room`);
await session.delay(1000);
@ -27,4 +25,4 @@ module.exports = async function invite(session, userId) {
const confirmButton = await session.query(".mx_Dialog_primary");
await confirmButton.click();
session.log.done();
}
};

View file

@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
const assert = require('assert');
const {openRoomDirectory} = require('./create-room');
module.exports = async function join(session, roomName) {
@ -27,4 +26,4 @@ module.exports = async function join(session, roomName) {
await joinFirstLink.click();
await session.query('.mx_MessageComposer');
session.log.done();
}
};

View file

@ -22,7 +22,7 @@ async function openMemberInfo(session, name) {
return m.displayName === name;
}).map((m) => m.label)[0];
await matchingLabel.click();
};
}
module.exports.openMemberInfo = openMemberInfo;
@ -39,10 +39,11 @@ module.exports.verifyDeviceForUser = async function(session, name, expectedDevic
// expect "Verify device" dialog and click "Begin Verification"
const dialogHeader = await session.innerText(await session.query(".mx_Dialog .mx_Dialog_title"));
assert(dialogHeader, "Verify device");
const beginVerificationButton = await session.query(".mx_Dialog .mx_Dialog_primary")
const beginVerificationButton = await session.query(".mx_Dialog .mx_Dialog_primary");
await beginVerificationButton.click();
// get emoji SAS labels
const sasLabelElements = await session.queryAll(".mx_VerificationShowSas .mx_VerificationShowSas_emojiSas .mx_VerificationShowSas_emojiSas_label");
const sasLabelElements = await session.queryAll(
".mx_VerificationShowSas .mx_VerificationShowSas_emojiSas .mx_VerificationShowSas_emojiSas_label");
const sasLabels = await Promise.all(sasLabelElements.map(e => session.innerText(e)));
console.log("my sas labels", sasLabels);
@ -58,7 +59,7 @@ module.exports.verifyDeviceForUser = async function(session, name, expectedDevic
const closeMemberInfo = await session.query(".mx_MemberInfo_cancel");
await closeMemberInfo.click();
session.log.done();
}
};
async function getMembersInMemberlist(session) {
const memberNameElements = await session.queryAll(".mx_MemberList .mx_EntityTile_name");

View file

@ -96,4 +96,4 @@ module.exports = async function changeRoomSettings(session, settings) {
await closeButton.click();
session.log.endGroup();
}
};

View file

@ -31,4 +31,4 @@ module.exports = async function sendMessage(session, message) {
// wait for the message to appear sent
await session.query(".mx_EventTile_last:not(.mx_EventTile_sending)");
session.log.done();
}
};

View file

@ -22,7 +22,8 @@ async function openSettings(session, section) {
const settingsItem = await session.query(".mx_TopLeftMenu_icon_settings");
await settingsItem.click();
if (section) {
const sectionButton = await session.query(`.mx_UserSettingsDialog .mx_TabbedView_tabLabels .mx_UserSettingsDialog_${section}Icon`);
const sectionButton = await session.query(
`.mx_UserSettingsDialog .mx_TabbedView_tabLabels .mx_UserSettingsDialog_${section}Icon`);
await sectionButton.click();
}
}
@ -37,7 +38,7 @@ module.exports.enableLazyLoading = async function(session) {
const closeButton = await session.query(".mx_RoomHeader_cancelButton");
await closeButton.click();
session.log.done();
}
};
module.exports.getE2EDeviceFromSettings = async function(session) {
session.log.step(`gets e2e device/key from settings`);
@ -50,4 +51,4 @@ module.exports.getE2EDeviceFromSettings = async function(session) {
await closeButton.click();
session.log.done();
return {id, key};
}
};

View file

@ -60,8 +60,8 @@ module.exports = async function signup(session, username, password, homeserver)
// Password validation is async, wait for it to complete before submit
await session.query(".mx_Field_valid #mx_RegistrationForm_password");
//check no errors
const error_text = await session.tryGetInnertext('.mx_Login_error');
assert.strictEqual(!!error_text, false);
const errorText = await session.tryGetInnertext('.mx_Login_error');
assert.strictEqual(!!errorText, false);
//submit form
//await page.screenshot({path: "beforesubmit.png", fullPage: true});
await registerButton.click();
@ -87,4 +87,4 @@ module.exports = async function signup(session, username, password, homeserver)
});
assert(foundHomeUrl);
session.log.done();
}
};

View file

@ -36,11 +36,11 @@ module.exports.scrollToTimelineTop = async function(session) {
} else {
await new Promise((resolve) => setTimeout(resolve, 50));
}
} while (!timedOut)
} while (!timedOut);
});
})
});
session.log.done();
}
};
module.exports.receiveMessage = async function(session, expectedMessage) {
session.log.step(`receives message "${expectedMessage.body}" from ${expectedMessage.sender}`);
@ -56,7 +56,7 @@ module.exports.receiveMessage = async function(session, expectedMessage) {
await session.poll(async () => {
try {
lastMessage = await getLastMessage();
} catch(err) {
} catch (err) {
return false;
}
// stop polling when found the expected message
@ -66,10 +66,10 @@ module.exports.receiveMessage = async function(session, expectedMessage) {
});
assertMessage(lastMessage, expectedMessage);
session.log.done();
}
};
module.exports.checkTimelineContains = async function (session, expectedMessages, sendersDescription) {
module.exports.checkTimelineContains = async function(session, expectedMessages, sendersDescription) {
session.log.step(`checks timeline contains ${expectedMessages.length} ` +
`given messages${sendersDescription ? ` from ${sendersDescription}`:""}`);
const eventTiles = await getAllEventTiles(session);
@ -94,14 +94,14 @@ module.exports.checkTimelineContains = async function (session, expectedMessages
});
try {
assertMessage(foundMessage, expectedMessage);
} catch(err) {
} catch (err) {
console.log("timelineMessages", timelineMessages);
throw err;
}
});
session.log.done();
}
};
function assertMessage(foundMessage, expectedMessage) {
assert(foundMessage, `message ${JSON.stringify(expectedMessage)} not found in timeline`);

View file

@ -31,7 +31,8 @@ async function startVerification(session, name) {
}
async function getSasCodes(session) {
const sasLabelElements = await session.queryAll(".mx_VerificationShowSas .mx_VerificationShowSas_emojiSas .mx_VerificationShowSas_emojiSas_label");
const sasLabelElements = await session.queryAll(
".mx_VerificationShowSas .mx_VerificationShowSas_emojiSas .mx_VerificationShowSas_emojiSas_label");
const sasLabels = await Promise.all(sasLabelElements.map(e => session.innerText(e)));
return sasLabels;
}