Commit c13f2ef5 authored by BryceLTaylor's avatar BryceLTaylor

Check if using circle and add default workflow id to tests and check

parent 7ea74eb4
...@@ -5,7 +5,8 @@ require('chromedriver'); ...@@ -5,7 +5,8 @@ require('chromedriver');
const headless = process.env.SMOKE_HEADLESS || false; const headless = process.env.SMOKE_HEADLESS || false;
const remote = process.env.SMOKE_REMOTE || false; const remote = process.env.SMOKE_REMOTE || false;
const ci = process.env.CI || false; const ci = process.env.CI || false;
const buildID = process.env.CIRCLE_WORKFLOW_ID; const usingCircle = process.env.CIRCLECI || false;
const buildID = process.env.CIRCLE_WORKFLOW_ID || '0000';
const {SAUCE_USERNAME, SAUCE_ACCESS_KEY} = process.env; const {SAUCE_USERNAME, SAUCE_ACCESS_KEY} = process.env;
const {By, Key, until} = webdriver; const {By, Key, until} = webdriver;
...@@ -35,7 +36,8 @@ class SeleniumHelper { ...@@ -35,7 +36,8 @@ class SeleniumHelper {
if (remote === 'true'){ if (remote === 'true'){
let nameToUse; let nameToUse;
if (ci === 'true'){ if (ci === 'true'){
nameToUse = 'circleCI ' + buildID + ' : ' + name; let ciName = usingCircle ? 'circleCi ' : 'unknown ';
nameToUse = ciName + buildID + ' : ' + name;
} else { } else {
nameToUse = name; nameToUse = name;
} }
......
...@@ -6,7 +6,8 @@ const chromedriverVersion = require('chromedriver').version; ...@@ -6,7 +6,8 @@ const chromedriverVersion = require('chromedriver').version;
const headless = process.env.SMOKE_HEADLESS || false; const headless = process.env.SMOKE_HEADLESS || false;
const remote = process.env.SMOKE_REMOTE || false; const remote = process.env.SMOKE_REMOTE || false;
const ci = process.env.CI || false; const ci = process.env.CI || false;
const buildID = process.env.CIRCLE_WORKFLOW_ID; const usingCircle = process.env.CIRCLECI || false;
const buildID = process.env.CIRCLE_WORKFLOW_ID || '0000';
const {SAUCE_USERNAME, SAUCE_ACCESS_KEY} = process.env; const {SAUCE_USERNAME, SAUCE_ACCESS_KEY} = process.env;
const {By, Key, until} = webdriver; const {By, Key, until} = webdriver;
...@@ -36,7 +37,8 @@ class SeleniumHelper { ...@@ -36,7 +37,8 @@ class SeleniumHelper {
if (remote === 'true'){ if (remote === 'true'){
let nameToUse; let nameToUse;
if (ci === 'true'){ if (ci === 'true'){
nameToUse = 'circleCI ' + buildID + ' : ' + name; let ciName = usingCircle ? 'circleCi ' : 'unknown ';
nameToUse = ciName + buildID + ' : ' + name;
} else { } else {
nameToUse = name; nameToUse = name;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment