mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-04-29 19:41:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:cypress-io/cypress into chore/release_13_misc

Browse Source
This commit is contained in:
Bill Glesias
2023-06-14 15:34:04 -04:00
parent 75962b8974 c72056978b
commit 1554858196
5 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/circle-env.js
+2 -4
View File
@@ -20,13 +20,11 @@ async function checkCanaries () {
const circleEnv = await readCircleEnv()
// if the config contains only CIRCLE_OIDC_TOKEN, CIRCLE_OIDC_TOKEN_V2, CIRCLE_PLUGIN_TEST, treat the config as if it were empty
// if the config contains only CIRCLE_PLUGIN_TEST, treat the config as if it were empty
const containsOnlyAllowedEnvs = () => {
const circleEnvKeys = Object.keys(circleEnv)
return circleEnvKeys.length === 0 || (circleEnvKeys.length === 3 &&
circleEnvKeys.includes('CIRCLE_OIDC_TOKEN') &&
circleEnvKeys.includes('CIRCLE_OIDC_TOKEN_V2') &&
return circleEnvKeys.length === 0 || (circleEnvKeys.length === 1 &&
circleEnvKeys.includes('CIRCLE_PLUGIN_TEST'))
}
scripts/unit/circle-env-spec.js
-6
View File
@@ -61,8 +61,6 @@ describe('circle-env', () => {
sinon.stub(fs, 'readFile')
.withArgs('/foo.json').resolves(JSON.stringify({
Dispatched: { TaskInfo: { Environment: {
CIRCLE_OIDC_TOKEN: 'foo',
CIRCLE_OIDC_TOKEN_V2: 'bar',
CIRCLE_PLUGIN_TEST: 'baz',
} } },
}))
@@ -76,8 +74,6 @@ describe('circle-env', () => {
sinon.stub(fs, 'readFile')
.withArgs('/foo.json').resolves(JSON.stringify({
Dispatched: { TaskInfo: { Environment: {
CIRCLE_OIDC_TOKEN: 'foo',
CIRCLE_OIDC_TOKEN_V2: 'bar',
CIRCLE_PLUGIN_TEST: 'baz',
MAIN_CANARY: 'qux',
CONTEXT_CANARY: 'quux',
@@ -91,8 +87,6 @@ describe('circle-env', () => {
sinon.stub(fs, 'readFile')
.withArgs('/foo.json').resolves(JSON.stringify({
Dispatched: { TaskInfo: { Environment: {
CIRCLE_OIDC_TOKEN: 'foo',
CIRCLE_OIDC_TOKEN_V2: 'bar',
CIRCLE_PLUGIN_TEST: 'baz',
SOME_OTHER_VAR: 'quux',
} } },