use WORKSPACE env var for stack_functional_integration tests, fix nav…

…igate path (elastic#71908) Co-authored-by: Elastic Machine <[email protected]>
LeeDr · Jul 17, 2020 · 5f1d925 · 5f1d925
1 parent d7168a0
commit 5f1d925
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
@@ -12,12 +12,16 @@ import { esTestConfig, kbnTestConfig } from '@kbn/test';
 
 const reportName = 'Stack Functional Integration Tests';
 const testsFolder = '../test/functional/apps';
-const stateFilePath = '../../../../../integration-test/qa/envvars.sh';
-const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`);
 const log = new ToolingLog({
   level: 'info',
   writeTo: process.stdout,
 });
+log.info(`WORKSPACE in config file ${process.env.WORKSPACE}`);
+const stateFilePath = process.env.WORKSPACE
+  ? `${process.env.WORKSPACE}/qa/envvars.sh`
+  : '../../../../../integration-test/qa/envvars.sh';
+
+const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`);
 
 export default async ({ readConfigFile }) => {
   const defaultConfigs = await readConfigFile(require.resolve('../../functional/config'));

diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/sample_data/e_commerce.js b/x-pack/test/stack_functional_integration/test/functional/apps/sample_data/e_commerce.js
@@ -12,7 +12,7 @@ export default function ({ getService, getPageObjects }) {
 
     before(async () => {
       await browser.setWindowSize(1200, 800);
-      await PageObjects.common.navigateToUrl('home', '/home/tutorial_directory/sampleData', {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
         useActualUrl: true,
         insertTimestamp: false,
       });