From 421329b2bfedcd7345c19e90b6ff58fad1fcfc18 Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Tue, 30 Apr 2019 10:31:53 -0400 Subject: [PATCH 1/2] detect forked PR on AppVeyor CI, close #4063 --- packages/server/lib/modes/record.coffee | 2 +- packages/server/package.json | 2 +- packages/server/test/integration/cypress_spec.coffee | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/server/lib/modes/record.coffee b/packages/server/lib/modes/record.coffee index bb966562cda3..b43269d61b6a 100644 --- a/packages/server/lib/modes/record.coffee +++ b/packages/server/lib/modes/record.coffee @@ -258,7 +258,7 @@ createRun = (options = {}) -> recordKey ?= env.get("CYPRESS_RECORD_KEY") or env.get("CYPRESS_CI_KEY") if not recordKey - ## are we a forked PR and are we NOT running our own internal + ## are we a forked pull request (forked PR) and are we NOT running our own internal ## e2e tests? currently some e2e tests fail when a user submits ## a PR because this logic triggers unintended here if isForkPr.isForkPr() and not runningInternalTests() diff --git a/packages/server/package.json b/packages/server/package.json index 3d146b1030f5..3960963dad38 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -145,7 +145,7 @@ "http-status-codes": "1.3.2", "human-interval": "0.1.6", "image-size": "0.7.2", - "is-fork-pr": "2.0.0", + "is-fork-pr": "2.2.0", "jimp": "0.6.0", "jsonlint": "1.6.3", "konfig": "0.2.1", diff --git a/packages/server/test/integration/cypress_spec.coffee b/packages/server/test/integration/cypress_spec.coffee index 07199d958127..eb26b73e08d7 100644 --- a/packages/server/test/integration/cypress_spec.coffee +++ b/packages/server/test/integration/cypress_spec.coffee @@ -9,7 +9,6 @@ http = require("http") Promise = require("bluebird") electron = require("electron") commitInfo = require("@cypress/commit-info") -isForkPr = require("is-fork-pr") Fixtures = require("../support/helpers/fixtures") snapshot = require("snap-shot-it") stripAnsi = require("strip-ansi") From c5510bc01c2e51189ab8a30668c7b2a3befa0a96 Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Tue, 30 Apr 2019 11:27:03 -0400 Subject: [PATCH 2/2] match what CircleCI has for env variables --- packages/server/test/e2e/7_record_spec.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/test/e2e/7_record_spec.coffee b/packages/server/test/e2e/7_record_spec.coffee index d713be9dcd81..d07315e29296 100644 --- a/packages/server/test/e2e/7_record_spec.coffee +++ b/packages/server/test/e2e/7_record_spec.coffee @@ -502,6 +502,7 @@ describe "e2e record", -> expect(getRequestUrls()).to.be.empty it "warns but does not exit when is forked pr", -> + process.env.CIRCLECI = "true" process.env.CIRCLE_PR_NUMBER = "123" process.env.CIRCLE_PR_USERNAME = "brian-mann" process.env.CIRCLE_PR_REPONAME = "cypress" @@ -517,7 +518,7 @@ describe "e2e record", -> expect(getRequestUrls()).to.be.empty it "warns but does not exit when is forked pr and parallel", -> - process.env.CIRCLECI = "1" + process.env.CIRCLECI = "true" process.env.CIRCLE_WORKFLOW_ID = "123" process.env.CIRCLE_PR_NUMBER = "123" process.env.CIRCLE_PR_USERNAME = "brian-mann"