fix sender_keys itest

ts/test/session/integration/common.ts

@@ -19,12 +19,12 @@ chai.use(chaiAsPromised as any);
 chai.config.includeStack = true;
 
 // FIXME audric
-// // From https://github.com/chaijs/chai/issues/200
-// chai.use((_chai, _) => {
-//   _chai.Assertion.addMethod('withMessage', (msg:any) => {
-//     _.flag(Common, 'message', msg);
-//   });
-// });
+// From https://github.com/chaijs/chai/issues/200
+chai.use((_chai, _) => {
+  _chai.Assertion.addMethod('withMessage', (msg: string) => {
+    _.flag(Common, 'message', msg);
+  });
+});
 
 const STUB_SNODE_SERVER_PORT = 3000;
 const ENABLE_LOG = false;
@@ -272,7 +272,7 @@ export class Common {
     app1: Application,
     client2: [Application, string]
   ) {
-    const [app2, pubkey2] = client2;
+    const [_, pubkey2] = client2;
 
     /** add each other as friends */
     const textMessage = Common.generateSendMessageText();

ts/test/session/integration/integration_itest.ts

@@ -7,10 +7,10 @@ import './open_group_itest';
 import './add_contacts_itest';
 import './link_device_itest';
 import './closed_group_itest';
-// import './message_functions_itest';
-// import './settings_itest';
-// import'./message_sync_itest';
-// import './sender_keys_itest';
+import './message_functions_itest';
+import './settings_itest';
+import './message_sync_itest';
+import './sender_keys_itest';
 
 before(async function() {
   // start the app once before all tests to get the platform-dependent

ts/test/session/integration/message_functions_itest.ts

@@ -30,13 +30,14 @@ describe('Message Functions', function() {
     await Common.stopStubSnodeServer();
   });
 
-  it('can send attachment', async () => {
+  it('messageFunction: can send attachment', async () => {
     // create group and add new friend
     await Common.addFriendToNewClosedGroup([app, app2], false);
 
     // send attachment from app1 to closed group
     const fileLocation = path.join(__dirname, 'test_attachment');
     const messageText = 'test_attachment';
+    await Common.closeToast(app);
 
     await Common.sendMessage(app, messageText, fileLocation);
 
@@ -52,7 +53,7 @@ describe('Message Functions', function() {
     );
   });
 
-  it('can delete message', async () => {
+  it('messageFunction: can delete message', async () => {
     // create group and add new friend
     await Common.addFriendToNewClosedGroup([app, app2], false);
     const messageText = 'delete_me';

ts/test/session/integration/message_sync_itest.ts

@@ -4,7 +4,7 @@
 // tslint:disable: no-implicit-dependencies
 // tslint:disable: no-invalid-this
 
-import { after, before, describe, it } from 'mocha';
+import { after, before, it, describe} from 'mocha';
 import { Common } from './common';
 import { Application } from 'spectron';
 
@@ -40,7 +40,7 @@ describe('Message Syncing', function() {
     await Common.stopStubSnodeServer();
   });
 
-  it('message syncing with 1 friend, 1 closed group, 1 open group', async () => {
+  xit('message syncing with 1 friend, 1 closed group, 1 open group', async () => {
     // Alice1 has:
     //  *  no linked device
     //  *  Bob is a friend

ts/test/session/integration/page-objects/conversation.page.ts

@@ -26,7 +26,7 @@ export = {
       `${num} members`
     ),
 
-  conversationItem: commonPage.divWithClass('module-conversation-list-item'),
+  conversationItem: '//*[contains(@class, \'module-conversation-list-item\')]',
 
   attachmentInput: '//*[contains(@class, "choose-file")]/input[@type="file"]',
   attachmentButton: '//*[contains(@class, "choose-file")]/button',

ts/test/session/integration/sender_keys_itest.ts

@@ -36,10 +36,14 @@ async function makeFriendsPlusMessage(
   app: Application,
   [app2, pubkey]: [Application, string]
 ) {
+
   await Common.makeFriends(app, [app2, pubkey]);
 
   // Send something back so that `app` can see our name
+  await app2.client.waitForExist(ConversationPage.conversationItem, 5000);
+  await app2.client.element(ConversationPage.conversationItem).click();
   const text = await generateAndSendMessage(app2);
+
   await app.client.waitForExist(
     ConversationPage.existingReceivedMessageText(text),
     8000
@@ -104,8 +108,8 @@ async function testThreeMembers() {
   ]);
 
   // 2. Make A friends with B and C (B and C are not friends)
-
   await makeFriendsPlusMessage(app1, [app2, Common.TEST_PUBKEY2]);
+
   await makeFriendsPlusMessage(app1, [app3, Common.TEST_PUBKEY3]);
 
   const useSenderKeys = true;
@@ -116,17 +120,14 @@ async function testThreeMembers() {
 
   // 4. Test that all members can see the message from app1
   const text1 = await generateAndSendMessage(app1);
-
   await app2.client.waitForExist(
     ConversationPage.existingReceivedMessageText(text1),
     5000
   );
-
   await app3.client.waitForExist(
     ConversationPage.existingReceivedMessageText(text1),
     5000
   );
-
   // TODO: test that B and C can send messages to the group
 
   // const text2 = await generateAndSendMessage(app3);

ts/test/session/integration/settings_itest.ts

@@ -40,7 +40,7 @@ describe('Settings', function() {
     await Common.stopStubSnodeServer();
   });
 
-  it('can toggle menubar', async () => {
+  it('settings: can toggle menubar', async () => {
     const menuBarVisible = await app.browserWindow.isMenuBarVisible();
 
     await app.client.element(SettingsPage.settingsButtonSection).click();
@@ -53,7 +53,7 @@ describe('Settings', function() {
     menuBarToggled.should.equal(!menuBarVisible);
   });
 
-  it('can set password', async () => {
+  it('settings: can set password', async () => {
     await app.client
       .element(SettingsPage.settingsRowWithText('Privacy'))
       .click();
@@ -84,7 +84,7 @@ describe('Settings', function() {
     await Common.closeToast(app);
   });
 
-  it('can remove password', async () => {
+  it('settings: can remove password', async () => {
     // Enter password to unlock settings
     await Common.setValueWrapper(
       app,