Skip to content

Commit 65d7718

Browse files
cacieprinscacieprins
authored
Merge branch 'develop' into feat-api-failure-exit-112
2 parents 4152a21 + c970ae2 commit 65d7718

File tree

5 files changed

+75
-64
lines changed

5 files changed

+75
-64
lines changed

‎packages/driver/cypress/e2e/dom/jquery.cy.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
/// <reference path="./jquery.d.ts" />
2+
13
describe('src/dom/jquery', () => {
24
context('.isJquery', () => {
35
it('does not get confused when window contains jquery function', () => {
4-
// @ts-expect-error - Intentionally adding jquery property to test conflict detection
56
window.jquery = () => {}
67

78
expect(Cypress.dom.isJquery(window)).to.be.false

‎packages/driver/cypress/e2e/dom/jquery.d.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
declare global {
2+
interface Window {
3+
jquery: () => void | undefined | null
4+
}
5+
}
6+
7+
export {}

‎tooling/v8-snapshot/cache/darwin/snapshot-meta.json‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,18 @@
776776
"./packages/launcher/lib/browsers.ts",
777777
"./packages/net-stubbing/lib/internal-types.ts",
778778
"./packages/net-stubbing/lib/types.ts",
779-
"./packages/network/index.js",
780-
"./packages/network/lib/agent.ts",
781-
"./packages/network/lib/uri.ts",
779+
"./packages/network-tools/cjs/cors.js",
780+
"./packages/network-tools/cjs/document-domain-injection.js",
781+
"./packages/network-tools/cjs/index.js",
782+
"./packages/network-tools/cjs/uri.js",
783+
"./packages/network/cjs/agent.js",
784+
"./packages/network/cjs/blocked.js",
785+
"./packages/network/cjs/ca.js",
786+
"./packages/network/cjs/client-certificates.js",
787+
"./packages/network/cjs/concat-stream.js",
788+
"./packages/network/cjs/connect.js",
789+
"./packages/network/cjs/http-utils.js",
790+
"./packages/network/cjs/index.js",
782791
"./packages/proxy/index.js",
783792
"./packages/proxy/lib/http/index.ts",
784793
"./packages/proxy/lib/http/request-middleware.ts",
@@ -3947,16 +3956,8 @@
39473956
"./packages/net-stubbing/node_modules/mime/index.js",
39483957
"./packages/net-stubbing/node_modules/mime/types/other.js",
39493958
"./packages/net-stubbing/node_modules/mime/types/standard.js",
3950-
"./packages/network/lib/allow-destroy.ts",
3951-
"./packages/network/lib/blocked.ts",
3952-
"./packages/network/lib/ca.ts",
3953-
"./packages/network/lib/client-certificates.ts",
3954-
"./packages/network/lib/concat-stream.ts",
3955-
"./packages/network/lib/connect.ts",
3956-
"./packages/network/lib/cors.ts",
3957-
"./packages/network/lib/document-domain-injection.ts",
3958-
"./packages/network/lib/http-utils.ts",
3959-
"./packages/network/lib/index.ts",
3959+
"./packages/network-tools/cjs/types.js",
3960+
"./packages/network/cjs/allow-destroy.js",
39603961
"./packages/network/node_modules/proxy-from-env/index.js",
39613962
"./packages/proxy/lib/http/error-middleware.ts",
39623963
"./packages/proxy/lib/http/util/ast-rewriter.ts",
@@ -4321,13 +4322,13 @@
43214322
"./packages/stderr-filtering/dist/index.js",
43224323
"./packages/stderr-filtering/dist/logError.js",
43234324
"./packages/stderr-filtering/dist/writeWithBackpressure.js",
4324-
"./packages/telemetry/dist/detectors/circleCiDetectorSync.js",
4325-
"./packages/telemetry/dist/index.js",
4326-
"./packages/telemetry/dist/node.js",
4327-
"./packages/telemetry/dist/processors/on-start-span-processor.js",
4328-
"./packages/telemetry/dist/span-exporters/cloud-span-exporter.js",
4329-
"./packages/telemetry/dist/span-exporters/console-trace-link-exporter.js",
4330-
"./packages/telemetry/dist/span-exporters/ipc-span-exporter.js",
4325+
"./packages/telemetry/cjs/detectors/circleCiDetectorSync.js",
4326+
"./packages/telemetry/cjs/node.js",
4327+
"./packages/telemetry/cjs/processors/on-start-span-processor.js",
4328+
"./packages/telemetry/cjs/span-exporters/cloud-span-exporter.js",
4329+
"./packages/telemetry/cjs/span-exporters/console-trace-link-exporter.js",
4330+
"./packages/telemetry/cjs/span-exporters/ipc-span-exporter.js",
4331+
"./packages/telemetry/cjs/telemetry/index.js",
43314332
"./packages/ts/registerDir.js",
43324333
"./packages/types/cjs/auth.js",
43334334
"./packages/types/cjs/automation.js",
@@ -4357,5 +4358,5 @@
43574358
"./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
43584359
],
43594360
"deferredHashFile": "yarn.lock",
4360-
"deferredHash": "0f271894ce617a509a34729c655b79a1ddcc0a83c9384a90f258bb521703a0d1"
4361+
"deferredHash": "885be5a2d8a0d33f35972325ea7ef0467933f610940486ce6add9be70dfb8dc5"
43614362
}

‎tooling/v8-snapshot/cache/linux/snapshot-meta.json‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -775,9 +775,18 @@
775775
"./packages/launcher/lib/browsers.ts",
776776
"./packages/net-stubbing/lib/internal-types.ts",
777777
"./packages/net-stubbing/lib/types.ts",
778-
"./packages/network/index.js",
779-
"./packages/network/lib/agent.ts",
780-
"./packages/network/lib/uri.ts",
778+
"./packages/network-tools/cjs/cors.js",
779+
"./packages/network-tools/cjs/document-domain-injection.js",
780+
"./packages/network-tools/cjs/index.js",
781+
"./packages/network-tools/cjs/uri.js",
782+
"./packages/network/cjs/agent.js",
783+
"./packages/network/cjs/blocked.js",
784+
"./packages/network/cjs/ca.js",
785+
"./packages/network/cjs/client-certificates.js",
786+
"./packages/network/cjs/concat-stream.js",
787+
"./packages/network/cjs/connect.js",
788+
"./packages/network/cjs/http-utils.js",
789+
"./packages/network/cjs/index.js",
781790
"./packages/proxy/index.js",
782791
"./packages/proxy/lib/http/index.ts",
783792
"./packages/proxy/lib/http/request-middleware.ts",
@@ -3946,16 +3955,8 @@
39463955
"./packages/net-stubbing/node_modules/mime/index.js",
39473956
"./packages/net-stubbing/node_modules/mime/types/other.js",
39483957
"./packages/net-stubbing/node_modules/mime/types/standard.js",
3949-
"./packages/network/lib/allow-destroy.ts",
3950-
"./packages/network/lib/blocked.ts",
3951-
"./packages/network/lib/ca.ts",
3952-
"./packages/network/lib/client-certificates.ts",
3953-
"./packages/network/lib/concat-stream.ts",
3954-
"./packages/network/lib/connect.ts",
3955-
"./packages/network/lib/cors.ts",
3956-
"./packages/network/lib/document-domain-injection.ts",
3957-
"./packages/network/lib/http-utils.ts",
3958-
"./packages/network/lib/index.ts",
3958+
"./packages/network-tools/cjs/types.js",
3959+
"./packages/network/cjs/allow-destroy.js",
39593960
"./packages/network/node_modules/proxy-from-env/index.js",
39603961
"./packages/proxy/lib/http/error-middleware.ts",
39613962
"./packages/proxy/lib/http/util/ast-rewriter.ts",
@@ -4320,13 +4321,13 @@
43204321
"./packages/stderr-filtering/dist/index.js",
43214322
"./packages/stderr-filtering/dist/logError.js",
43224323
"./packages/stderr-filtering/dist/writeWithBackpressure.js",
4323-
"./packages/telemetry/dist/detectors/circleCiDetectorSync.js",
4324-
"./packages/telemetry/dist/index.js",
4325-
"./packages/telemetry/dist/node.js",
4326-
"./packages/telemetry/dist/processors/on-start-span-processor.js",
4327-
"./packages/telemetry/dist/span-exporters/cloud-span-exporter.js",
4328-
"./packages/telemetry/dist/span-exporters/console-trace-link-exporter.js",
4329-
"./packages/telemetry/dist/span-exporters/ipc-span-exporter.js",
4324+
"./packages/telemetry/cjs/detectors/circleCiDetectorSync.js",
4325+
"./packages/telemetry/cjs/node.js",
4326+
"./packages/telemetry/cjs/processors/on-start-span-processor.js",
4327+
"./packages/telemetry/cjs/span-exporters/cloud-span-exporter.js",
4328+
"./packages/telemetry/cjs/span-exporters/console-trace-link-exporter.js",
4329+
"./packages/telemetry/cjs/span-exporters/ipc-span-exporter.js",
4330+
"./packages/telemetry/cjs/telemetry/index.js",
43304331
"./packages/ts/registerDir.js",
43314332
"./packages/types/cjs/auth.js",
43324333
"./packages/types/cjs/automation.js",
@@ -4356,5 +4357,5 @@
43564357
"./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
43574358
],
43584359
"deferredHashFile": "yarn.lock",
4359-
"deferredHash": "0f271894ce617a509a34729c655b79a1ddcc0a83c9384a90f258bb521703a0d1"
4360+
"deferredHash": "885be5a2d8a0d33f35972325ea7ef0467933f610940486ce6add9be70dfb8dc5"
43604361
}

‎tooling/v8-snapshot/cache/win32/snapshot-meta.json‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,18 @@
782782
"./packages/launcher/lib/browsers.ts",
783783
"./packages/net-stubbing/lib/internal-types.ts",
784784
"./packages/net-stubbing/lib/types.ts",
785-
"./packages/network/index.js",
786-
"./packages/network/lib/agent.ts",
787-
"./packages/network/lib/uri.ts",
785+
"./packages/network-tools/cjs/cors.js",
786+
"./packages/network-tools/cjs/document-domain-injection.js",
787+
"./packages/network-tools/cjs/index.js",
788+
"./packages/network-tools/cjs/uri.js",
789+
"./packages/network/cjs/agent.js",
790+
"./packages/network/cjs/blocked.js",
791+
"./packages/network/cjs/ca.js",
792+
"./packages/network/cjs/client-certificates.js",
793+
"./packages/network/cjs/concat-stream.js",
794+
"./packages/network/cjs/connect.js",
795+
"./packages/network/cjs/http-utils.js",
796+
"./packages/network/cjs/index.js",
788797
"./packages/proxy/index.js",
789798
"./packages/proxy/lib/http/index.ts",
790799
"./packages/proxy/lib/http/request-middleware.ts",
@@ -3946,16 +3955,8 @@
39463955
"./packages/net-stubbing/node_modules/mime/index.js",
39473956
"./packages/net-stubbing/node_modules/mime/types/other.js",
39483957
"./packages/net-stubbing/node_modules/mime/types/standard.js",
3949-
"./packages/network/lib/allow-destroy.ts",
3950-
"./packages/network/lib/blocked.ts",
3951-
"./packages/network/lib/ca.ts",
3952-
"./packages/network/lib/client-certificates.ts",
3953-
"./packages/network/lib/concat-stream.ts",
3954-
"./packages/network/lib/connect.ts",
3955-
"./packages/network/lib/cors.ts",
3956-
"./packages/network/lib/document-domain-injection.ts",
3957-
"./packages/network/lib/http-utils.ts",
3958-
"./packages/network/lib/index.ts",
3958+
"./packages/network-tools/cjs/types.js",
3959+
"./packages/network/cjs/allow-destroy.js",
39593960
"./packages/network/node_modules/proxy-from-env/index.js",
39603961
"./packages/proxy/lib/http/error-middleware.ts",
39613962
"./packages/proxy/lib/http/util/ast-rewriter.ts",
@@ -4320,13 +4321,13 @@
43204321
"./packages/stderr-filtering/dist/index.js",
43214322
"./packages/stderr-filtering/dist/logError.js",
43224323
"./packages/stderr-filtering/dist/writeWithBackpressure.js",
4323-
"./packages/telemetry/dist/detectors/circleCiDetectorSync.js",
4324-
"./packages/telemetry/dist/index.js",
4325-
"./packages/telemetry/dist/node.js",
4326-
"./packages/telemetry/dist/processors/on-start-span-processor.js",
4327-
"./packages/telemetry/dist/span-exporters/cloud-span-exporter.js",
4328-
"./packages/telemetry/dist/span-exporters/console-trace-link-exporter.js",
4329-
"./packages/telemetry/dist/span-exporters/ipc-span-exporter.js",
4324+
"./packages/telemetry/cjs/detectors/circleCiDetectorSync.js",
4325+
"./packages/telemetry/cjs/node.js",
4326+
"./packages/telemetry/cjs/processors/on-start-span-processor.js",
4327+
"./packages/telemetry/cjs/span-exporters/cloud-span-exporter.js",
4328+
"./packages/telemetry/cjs/span-exporters/console-trace-link-exporter.js",
4329+
"./packages/telemetry/cjs/span-exporters/ipc-span-exporter.js",
4330+
"./packages/telemetry/cjs/telemetry/index.js",
43304331
"./packages/ts/registerDir.js",
43314332
"./packages/types/cjs/auth.js",
43324333
"./packages/types/cjs/automation.js",
@@ -4356,5 +4357,5 @@
43564357
"./tooling/v8-snapshot/cache/win32/snapshot-entry.js"
43574358
],
43584359
"deferredHashFile": "yarn.lock",
4359-
"deferredHash": "c353653b61cdd0af874a0bde6c10bcb0b21f40bcb4add3b87a29380702febc35"
4360+
"deferredHash": "1535a3c7da63f962c611674f06b1c6e54c2deec1d80d898c2931954ccdc8419f"
43604361
}

0 commit comments

Comments
 (0)