looks like this code is running in a browser somewhere?

elastic · Jun 7, 2021 · ccf1a43 · ccf1a43
1 parent c8e9eb0
commit ccf1a43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts b/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts
@@ -7,17 +7,17 @@
 
 import Path from 'path';
 
-const ES_ARCHIVE_DIR = Path.resolve(__dirname, '../fixtures/es_archiver');
+const ES_ARCHIVE_DIR = './cypress/fixtures/es_archiver';
 
 export const esArchiverLoad = (folder: string) => {
-  const path = Path.resolve(ES_ARCHIVE_DIR, folder);
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
     `node ../../../../scripts/es_archiver load "${path}" --config ../../../test/functional/config.js`
   );
 };
 
 export const esArchiverUnload = (folder: string) => {
-  const path = Path.resolve(ES_ARCHIVE_DIR, folder);
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
     `node ../../../../scripts/es_archiver unload "${path}" --config ../../../test/functional/config.js`
   );

diff --git a/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts b/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts
@@ -7,23 +7,20 @@
 
 import Path from 'path';
 
-const ES_ARCHIVE_DIR = Path.resolve(
-  __dirname,
-  '../../../../test/security_solution_cypress/es_archives'
-);
-const CONFIG_PATH = Path.resolve(__dirname, '../../../../test/functional/config.js');
+const ES_ARCHIVE_DIR = '../../test/security_solution_cypress/es_archives';
+const CONFIG_PATH = '../../test/functional/config.js';
 const ES_URL = Cypress.env('ELASTICSEARCH_URL');
 const KIBANA_URL = Cypress.config().baseUrl;
 
 export const esArchiverLoad = (folder: string) => {
-  const path = Path.resolve(ES_ARCHIVE_DIR, folder);
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
     `node ../../../scripts/es_archiver load "${path}" --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"`
   );
 };
 
 export const esArchiverUnload = (folder: string) => {
-  const path = Path.resolve(ES_ARCHIVE_DIR, folder);
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
     `node ../../../scripts/es_archiver unload "${path}" --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"`
   );