Merge branch 'master' into bwindels/lltests

This commit is contained in:
Bruno Windels
2018-09-11 17:21:30 +02:00
11 changed files with 32 additions and 28 deletions
+5 -5
View File
@@ -15,7 +15,7 @@ limitations under the License.
*/
const {acceptDialog} = require('./tests/dialog');
const {acceptDialogMaybe} = require('./tests/dialog');
const signup = require('./tests/signup');
const join = require('./tests/join');
const sendMessage = require('./tests/send-message');
@@ -67,13 +67,13 @@ async function createE2ERoomAndTalk(alice, bob) {
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");
await bob.delay(1000);
await acceptDialogMaybe(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 alice.delay(1000);
await acceptDialogMaybe(alice, "encryption");
await verifyDeviceForUser(bob, "alice", aliceDevice);
await verifyDeviceForUser(alice, "bob", bobDevice);
const aliceMessage = "Guess what I just heard?!"