deleting messages init

integration_test/add_friends_test.js

@@ -1,7 +1,8 @@
 /* eslint-disable func-names  */
 /* eslint-disable import/no-extraneous-dependencies */
-const common = require('./common');
 const { afterEach, beforeEach, describe, it } = require('mocha');
+
+const common = require('./common');
 const ConversationPage = require('./page-objects/conversation.page');
 
 describe('Add friends', function() {

integration_test/closed_group_test.js

@@ -1,7 +1,8 @@
 /* eslint-disable func-names  */
 /* eslint-disable import/no-extraneous-dependencies */
-const common = require('./common');
 const { afterEach, beforeEach, describe, it } = require('mocha');
+const common = require('./common');
+
 const ConversationPage = require('./page-objects/conversation.page');
 
 describe('Closed groups', function() {

integration_test/common.js

@@ -4,15 +4,16 @@
 
 const { Application } = require('spectron');
 const path = require('path');
+const url = require('url');
+const http = require('http');
+const fse = require('fs-extra');
+const { exec } = require('child_process');
 
 const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');
 const RegistrationPage = require('./page-objects/registration.page');
 const ConversationPage = require('./page-objects/conversation.page');
-const { exec } = require('child_process');
-const url = require('url');
-const http = require('http');
-const fse = require('fs-extra');
+
 
 chai.should();
 chai.use(chaiAsPromised);

integration_test/integration_test.js

@@ -6,12 +6,12 @@
 const { before } = require('mocha');
 const common = require('./common');
 
+
 // require('./registration_test');
 // require('./open_group_test');
 // require('./add_friends_test');
 // require('./link_device_test');
 // require('./closed_group_test');
-
 require('./message_functions_test');
 
 

integration_test/link_device_test.js

@@ -2,8 +2,8 @@
 /* eslint-disable more/no-then */
 /* eslint-disable func-names  */
 /* eslint-disable import/no-extraneous-dependencies */
-const common = require('./common');
 const { afterEach, beforeEach, describe, it } = require('mocha');
+const common = require('./common');
 
 describe('Link Device', function() {
   let app;

integration_test/message_functions_test.js

@@ -53,18 +53,30 @@ describe('Message Functions', function() {
   });
   
   it('can delete message', async () => {
-    const messageText = 'delete me';
+    const messageText = 'delete_me';
     common.sendMessage(app, messageText);
 
     await app.client.waitForExist(
       ConversationPage.existingSendMessageText(messageText),
-      3000
+      5000
     );
     await app2.client.waitForExist(
       ConversationPage.existingReceivedMessageText(messageText),
-      5000
+      7000
     );
+    
+    // delete message in context menu
+    await app.client.element(ConversationPage.messageCtxMenu(messageText)).click();
+    await app.client.element(ConversationPage.deleteMessageCtxButton).click();
 
+    // delete messaage from modal
+    await app.client.waitForExist(
+      ConversationPage.deleteMessageModalButton,
+      3000
+    );
+    await app.client.element(ConversationPage.deleteMessageModalButton).click();
+    
+    // verify the message is actually deleted
     
 
   });

integration_test/message_sync_test.js

@@ -1,8 +1,9 @@
 /* eslint-disable func-names  */
 /* eslint-disable import/no-extraneous-dependencies */
-const common = require('./common');
 const { afterEach, beforeEach, describe, it } = require('mocha');
 
+const common = require('./common');
+
 
 describe('Message Syncing', function() {
   let app;

integration_test/open_group_test.js

@@ -1,7 +1,8 @@
 /* eslint-disable func-names  */
 /* eslint-disable import/no-extraneous-dependencies */
-const common = require('./common');
 const { afterEach, beforeEach, describe, it } = require('mocha');
+
+const common = require('./common');
 const ConversationPage = require('./page-objects/conversation.page');
 
 describe('Open groups', function() {

integration_test/page-objects/conversation.page.js

@@ -11,7 +11,7 @@ module.exports = {
   existingSendMessageText: textMessage =>
     `//*[contains(@class, "module-message__text--outgoing") and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
   existingFriendRequestText: textMessage =>
-    `//*[contains(@class, "module-message-friend-request__container")and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
+    `//*[contains(@class, "module-message-friend-request__container") and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
   existingReceivedMessageText: textMessage =>
     `//*[contains(@class, "module-message__text--incoming") and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
 
@@ -31,6 +31,10 @@ module.exports = {
   attachmentInput: '//*[contains(@class, "choose-file")]/input[@type="file"]',
   attachmentButton: '//*[contains(@class, "choose-file")]/button',
 
+  messageCtxMenu: message => `//div[contains(@class, "message-wrapper") and .//span[contains(@class, "text-selectable")][contains(string(), ${message})]]//div[contains(@class, 'module-message__buttons__menu')]`,
+  deleteMessageCtxButton: '//*[contains(@class, "react-contextmenu--visible")]/div[contains(string(), "Delete Message")]',
+  deleteMessageModalButton: '//*[contains(@class, "session-modal")]//div[contains(string(), "Delete") and contains(@class, "session-button")]',
+
   // channels
   globeButtonSection:
     '//*[contains(@class,"session-icon-button")  and .//*[contains(@class, "globe")]]',

integration_test/registration_test.js

@@ -2,8 +2,9 @@
 /* eslint-disable func-names  */
 /* eslint-disable import/no-extraneous-dependencies */
 
-const common = require('./common');
 const { afterEach, beforeEach, describe, it } = require('mocha');
+
+const common = require('./common');
 const RegistrationPage = require('./page-objects/registration.page');
 const ConversationPage = require('./page-objects/conversation.page');
 

yarn.lock

@@ -6077,11 +6077,6 @@ lodash-es@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
 
-lodash-es@^4.2.1:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
-  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
-
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
@@ -8763,8 +8758,8 @@ redent@^1.0.0:
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
   integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
-    loose-envify "^1.4.0"
-    symbol-observable "^1.2.0"
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
 
 reduce-css-calc@^1.2.6:
   version "1.3.0"
@@ -11230,7 +11225,7 @@ write-file-atomic@^1.1.4:
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
+    slide "^1.1.5"
 
 write-file-atomic@^3.0.0:
   version "3.0.3"