fix composer issue and more

src/scenario.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 
+const {acceptDialog} = require('./tests/dialog');
 const signup = require('./tests/signup');
 const join = require('./tests/join');
 const sendMessage = require('./tests/send-message');
@@ -31,8 +32,7 @@ module.exports = async function scenario(createSession) {
   async function createUser(username) {
     const session = await createSession(username);
     await signup(session, session.username, 'testtest');
-    const noticesName = "Server Notices";
+    await acceptServerNoticesInviteAndConsent(session);
-    await acceptServerNoticesInviteAndConsent(session, noticesName);
     return session;
   }
 
@@ -46,26 +46,40 @@ module.exports = async function scenario(createSession) {
 async function createDirectoryRoomAndTalk(alice, bob) {
   console.log(" creating a public room and join through directory:");
   const room = 'test';
-  const message = "hi Alice!";
   await createRoom(alice, room);
   await changeRoomSettings(alice, {directory: true, visibility: "public_no_guests"});
   await join(bob, room);
-  await sendMessage(bob, message);
+  const bobMessage = "hi Alice!";
-  await receiveMessage(alice, {sender: "bob", body: message});
+  await sendMessage(bob, bobMessage);
+  await receiveMessage(alice, {sender: "bob", body: bobMessage});
+  const aliceMessage = "hi Bob, welcome!"
+  await sendMessage(alice, aliceMessage);
+  await receiveMessage(bob, {sender: "alice", body: aliceMessage});
 }
 
 async function createE2ERoomAndTalk(alice, bob) {
   console.log(" creating an e2e encrypted room and join through invite:");
   const room = "secrets";
-  const message = "Guess what I just heard?!"
   await createRoom(bob, room);
   await changeRoomSettings(bob, {encryption: true});
   await invite(bob, "@alice:localhost");
   await acceptInvite(alice, room);
   const bobDevice = await getE2EDeviceFromSettings(bob);
+  // wait some time for the encryption warning dialog
+  // to appear after closing the settings
+  await bob.delay(500);
+  await acceptDialog(bob, "encryption");
   const aliceDevice = await getE2EDeviceFromSettings(alice);
+  // wait some time for the encryption warning dialog
+  // to appear after closing the settings
+  await alice.delay(500);
+  await acceptDialog(alice, "encryption");
   await verifyDeviceForUser(bob, "alice", aliceDevice);
   await verifyDeviceForUser(alice, "bob", bobDevice);
-  await sendMessage(alice, message);
+  const aliceMessage = "Guess what I just heard?!"
-  await receiveMessage(bob, {sender: "alice", body: message, encrypted: true});
+  await sendMessage(alice, aliceMessage);
+  await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
+  const bobMessage = "You've got to tell me!";
+  await sendMessage(bob, bobMessage);
+  await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
 }

src/tests/accept-invite.js

@@ -35,9 +35,7 @@ module.exports = async function acceptInvite(session, name) {
   await acceptInvitationLink.click();
 
   // accept e2e warning dialog
-  try {
+  acceptDialogMaybe(session, "encryption");
-    acceptDialogMaybe(session, "encryption");
-  } catch(err) {}
 
   session.log.done();
 }

src/tests/receive-message.js

@@ -16,26 +16,33 @@ limitations under the License.
 
 const assert = require('assert');
 
-
-async function getMessageFromTile(eventTile) {
-}
-
 module.exports = async function receiveMessage(session, message) {
-  session.log.step(`receives message "${message.body}" from ${message.sender} in room`);
+  session.log.step(`receives message "${message.body}" from ${message.sender}`);
   // wait for a response to come in that contains the message
   // crude, but effective
   await session.page.waitForResponse(async (response) => {
+    if (response.request().url().indexOf("/sync") === -1) {
+      return false;
+    }
     const body = await response.text();
-    return body.indexOf(message.body) !== -1;
+    if (message.encrypted) {
+      return body.indexOf(message.sender) !== -1 &&
+             body.indexOf("m.room.encrypted") !== -1;
+    } else {
+      return body.indexOf(message.body) !== -1;
+    }
   });
   // wait a bit for the incoming event to be rendered
-  await session.delay(100);
+  await session.delay(300);
   let lastTile = await session.query(".mx_EventTile_last");
   const senderElement = await lastTile.$(".mx_SenderProfile_name");
   const bodyElement = await lastTile.$(".mx_EventTile_body");
   const sender = await(await senderElement.getProperty("innerText")).jsonValue();
   const body = await(await bodyElement.getProperty("innerText")).jsonValue();
-  
+  if (message.encrypted) {
+    const e2eIcon = await lastTile.$(".mx_EventTile_e2eIcon");
+    assert.ok(e2eIcon);
+  }
   assert.equal(body, message.body);
   assert.equal(sender, message.sender);
   session.log.done();

src/tests/send-message.js

@@ -18,8 +18,12 @@ const assert = require('assert');
 
 module.exports = async function sendMessage(session, message) {
   session.log.step(`writes "${message}" in room`);
-  const composer = await session.waitAndQuery('.mx_MessageComposer');
+  // this selector needs to be the element that has contenteditable=true,
+  // not any if its parents, otherwise it behaves flaky at best.
+  const composer = await session.waitAndQuery('.mx_MessageComposer_editor');
   await composer.type(message);
+  const text = await session.innerText(composer);
+  assert.equal(text.trim(), message.trim());
   await composer.press("Enter");
   session.log.done();
 }

src/tests/server-notices-consent.js

@@ -16,8 +16,8 @@ limitations under the License.
 
 const assert = require('assert');
 const acceptInvite = require("./accept-invite")
-module.exports = async function acceptServerNoticesInviteAndConsent(session, noticesName) {
+module.exports = async function acceptServerNoticesInviteAndConsent(session) {
-  await acceptInvite(session, noticesName);
+  await acceptInvite(session, "Server Notices");
   session.log.step(`accepts terms & conditions`);
   const consentLink = await session.waitAndQuery(".mx_EventTile_body a", 1000);
   const termsPagePromise = session.waitForNewPage();

src/tests/verify-device.js

@@ -20,20 +20,18 @@ module.exports = async function verifyDeviceForUser(session, name, expectedDevic
   session.log.step(`verifies e2e device for ${name}`);
   const memberNameElements = await session.queryAll(".mx_MemberList .mx_EntityTile_name");
   const membersAndNames = await Promise.all(memberNameElements.map(async (el) => {
-  	const innerTextHandle = await memberNameElements.getProperty("innerText");
+  	return [el, await session.innerText(el)];
-  	const innerText = await innerTextHandle.jsonValue();
-  	return [el, innerText];
   }));
   const matchingMember = membersAndNames.filter(([el, text]) => {
   	return text === name;
-  }).map(([el, name]) => el);
+  }).map(([el]) => el)[0];
   await matchingMember.click();
   const firstVerifyButton = await session.waitAndQuery(".mx_MemberDeviceInfo_verify");
   await firstVerifyButton.click();
   const dialogCodeFields = await session.waitAndQueryAll(".mx_QuestionDialog code");
   assert.equal(dialogCodeFields.length, 2);
-  const deviceId = dialogCodeFields[0];
+  const deviceId = await session.innerText(dialogCodeFields[0]);
-  const deviceKey = dialogCodeFields[1];
+  const deviceKey = await session.innerText(dialogCodeFields[1]);
   assert.equal(expectedDevice.id, deviceId);
   assert.equal(expectedDevice.key, deviceKey);
   const confirmButton = await session.query(".mx_Dialog_primary");

start.js

@@ -21,13 +21,17 @@ const scenario = require('./src/scenario');
 const riotserver = 'http://localhost:5000';
 
 const noLogs = process.argv.indexOf("--no-logs") !== -1;
+const debug = process.argv.indexOf("--debug") !== -1;
 
 async function runTests() {
   let sessions = [];
 
   console.log("running tests ...");
   const options = {};
-  options.headless = false;
+  if (debug) {
+    // options.slowMo = 10;
+    options.headless = false;
+  }
   if (process.env.CHROME_PATH) {
     const path = process.env.CHROME_PATH;
     console.log(`(using external chrome/chromium at ${path}, make sure it's compatible with puppeteer)`);