Fix delete file action integration test

elasticio · Nov 27, 2019 · 68b155e · 68b155e
1 parent 73bbdda
commit 68b155e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -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);