Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
c13f2ef5
Commit
c13f2ef5
authored
May 18, 2021
by
BryceLTaylor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check if using circle and add default workflow id to tests and check
parent
7ea74eb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
test/integration-legacy/selenium-helpers.js
test/integration-legacy/selenium-helpers.js
+4
-2
test/integration/selenium-helpers.js
test/integration/selenium-helpers.js
+4
-2
No files found.
test/integration-legacy/selenium-helpers.js
View file @
c13f2ef5
...
@@ -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
;
}
}
...
...
test/integration/selenium-helpers.js
View file @
c13f2ef5
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment