From 5f1d925406140edb0d35a95e8624b46dc89fc15c Mon Sep 17 00:00:00 2001
From: Lee Drengenberg <lee.drengenberg@elastic.co>
Date: Fri, 17 Jul 2020 16:42:56 -0500
Subject: [PATCH] use WORKSPACE env var for stack_functional_integration tests,
 fix navigate path (#71908)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../configs/config.stack_functional_integration_base.js   | 8 ++++++--
 .../test/functional/apps/sample_data/e_commerce.js        | 2 +-
 2 files changed, 7 insertions(+), 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
index a34d158496ba0..96d338a04b01b 100644
--- 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
index 306f30133f6ee..0286f6984e89e 100644
--- 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,
       });