From 68b155ee1f12e478b1a5519623d2db76788d4004 Mon Sep 17 00:00:00 2001
From: ElBabbler <gladikov.denis@gmail.com>
Date: Wed, 27 Nov 2019 13:01:34 +0200
Subject: [PATCH] Fix delete file action integration test

---
 lib/utils/deleteUtil.js              |  5 ++++-
 spec-integration/integration.spec.js | 17 +++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/utils/deleteUtil.js b/lib/utils/deleteUtil.js
index 3ee61ef..86a6f6f 100644
--- a/lib/utils/deleteUtil.js
+++ b/lib/utils/deleteUtil.js
@@ -15,7 +15,10 @@ class SftpDelete extends DeleteById {
     const dir = cfg.directory.substring(cfg.directory.length - 1) === '/'
       ? cfg.directory.substring(0, cfg.directory.length - 1)
       : cfg.directory;
-    await this.client.delete(`${dir}/${filename}`);
+
+    const fullFilenameToDelete = `${dir}/${filename}`;
+    this.logger.info(`Deleting file by name: ${fullFilenameToDelete}`);
+    await this.client.delete(fullFilenameToDelete);
     return filename;
   }
 }
diff --git a/spec-integration/integration.spec.js b/spec-integration/integration.spec.js
index da954f8..46c7a2b 100644
--- a/spec-integration/integration.spec.js
+++ b/spec-integration/integration.spec.js
@@ -188,13 +188,18 @@ describe('SFTP integration test - upload then download', function () {
     expect(receiver.data[1].body.filename).to.equal('custom_logo2.svg');
     expect(receiver.data[1].body.size).to.equal(4379);
 
-    const upgadedCfg = JSON.parse(JSON.stringify(cfg));
-    upgadedCfg.directory = `${cfg.directory}${PROCESSED_FOLDER_NAME}`;
-    await deleteAction.process.call(receiver, { body: { filename: 'custom_logo.svg' } }, upgadedCfg);
-    await deleteAction.process.call(receiver, { body: { filename: 'custom_logo2.svg' } }, upgadedCfg);
+    const logoFilename = (await sftp.list(`${cfg.directory}${PROCESSED_FOLDER_NAME}`))[0].name;
+    const logo2Filename = (await sftp.list(`${cfg.directory}${PROCESSED_FOLDER_NAME}`))[1].name;
+
+    const upgradedCfg = JSON.parse(JSON.stringify(cfg));
+    upgradedCfg.directory = `${cfg.directory}${PROCESSED_FOLDER_NAME}`;
+    const deleteResult = await deleteAction.process.call(receiver,
+      { body: { filename: logoFilename } }, upgradedCfg);
+    const deleteResult2 = await deleteAction.process.call(receiver,
+      { body: { filename: logo2Filename } }, upgradedCfg);
 
-    expect(receiver.data[2].body.filename).to.equal('custom_logo.svg');
-    expect(receiver.data[3].body.filename).to.equal('custom_logo2.svg');
+    expect(deleteResult.body.filename).to.equal('custom_logo.svg');
+    expect(deleteResult2.body.filename).to.equal('custom_logo2.svg');
 
     await sftp.rmdir(`${cfg.directory}${PROCESSED_FOLDER_NAME}`, false);
     await sftp.rmdir(cfg.directory, false);