From 0e545f97737b410cfcf9db4ce147ae09923e3e75 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 14:15:43 +0630 Subject: [PATCH 1/2] =?UTF-8?q?fix(deps):=20update=20dependency=20arch=20t?= =?UTF-8?q?o=20version=202.1.2=20=F0=9F=8C=9F=20(#7672)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Renovate Bot --- cli/package.json | 2 +- yarn.lock | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cli/package.json b/cli/package.json index 877fde82d5e4..5198dc161ce7 100644 --- a/cli/package.json +++ b/cli/package.json @@ -25,7 +25,7 @@ "@cypress/xvfb": "1.2.4", "@types/sinonjs__fake-timers": "6.0.1", "@types/sizzle": "2.3.2", - "arch": "2.1.1", + "arch": "2.1.2", "bluebird": "3.7.2", "cachedir": "2.3.0", "chalk": "2.4.2", diff --git a/yarn.lock b/yarn.lock index 780e4fca8cd8..f878a3b77e18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5108,12 +5108,7 @@ aproba@^2.0.0: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -arch@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e" - integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg== - -arch@^2.1.0: +arch@2.1.2, arch@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf" integrity sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ== From b578032fefa0f630014e99c374a4b0403efcaead Mon Sep 17 00:00:00 2001 From: Ben Kucera <14625260+Bkucera@users.noreply.github.com> Date: Thu, 11 Jun 2020 19:11:58 -0400 Subject: [PATCH 2/2] internal: rename driver/test/cypress to driver/test (#7643) * rename driver/test/cypress to driver/test * use yarn workspace over lerna for individual package commands * add error message to driver start * remove usage of wait-on * update , import string * fix driver/readme * fix readmes after regex replace * revert wait-on changes * Revert "revert wait-on changes" This reverts commit 6de684cf3484fca8f7d8d6fe396bee248b62f819. * update yarn.lock * fix broken path in spec * fix broken paths in specs with @packages/driver * fix more broken spec paths * move type definition loading for driver/cypress into dedicated file * move internal-types to "types" folder, fix driver/index.d.ts * fix type-check in packages/runner. not exactly sure why * fix runner type-check by excluding test folder in tsconfig * bump timeout on e2e/8_error_ui_spec Co-authored-by: Brian Mann --- .gitignore | 4 +-- circle.yml | 22 +----------- package.json | 3 +- packages/driver/.gitignore | 4 +-- packages/driver/{test => }/cypress.json | 4 +-- .../driver/{test => cypress}/.eslintrc.json | 6 ++++ .../cypress/fixtures/active-elements.html | 0 .../{test => }/cypress/fixtures/angular.html | 0 .../driver/{test => }/cypress/fixtures/app.js | 0 .../{test => }/cypress/fixtures/app.json | 0 .../fixtures/blocking_beforeunload_event.html | 0 .../fixtures/blocking_onbeforeunload.html | 0 .../cypress/fixtures/comma-separated.csv | 0 .../cypress/fixtures/command-log.html | 0 .../{test => }/cypress/fixtures/commands.html | 0 .../cypress/fixtures/cross_origin.html | 0 .../cypress/fixtures/cross_origin_name.html | 0 .../cypress/fixtures/dangling-element.html | 0 .../cypress/fixtures/dimensions.html | 0 .../{test => }/cypress/fixtures/dom.html | 0 .../{test => }/cypress/fixtures/dropdown.html | 0 .../{test => }/cypress/fixtures/example.json | 0 .../cypress/fixtures/fixed-nav.html | 0 .../cypress/fixtures/foo.bar.baz.json | 0 .../{test => }/cypress/fixtures/form.html | 0 .../{test => }/cypress/fixtures/generic.html | 0 .../cypress/fixtures/generic_styles.css | 0 .../cypress/fixtures/generic_styles_2.css | 0 .../cypress/fixtures/generic_styles_3.css | 0 .../cypress/fixtures/generic_styles_print.css | 0 .../cypress/fixtures/global-error.html | 0 .../cypress/fixtures/hook_uncaught.html | 0 .../cypress/fixtures/iframe-inner.html | 0 .../cypress/fixtures/iframe-outer.html | 0 .../cypress/fixtures/invalid_html.html | 0 .../cypress/fixtures/issue-1436.html | 0 .../cypress/fixtures/issue-2956.html | 0 .../cypress/fixtures/issue-4373.html | 0 .../cypress/fixtures/issue-565.html | 0 .../cypress/fixtures/issue-5682.html | 0 .../cypress/fixtures/issue-5707.html | 0 .../cypress/fixtures/issue-599.html | 0 .../cypress/fixtures/issue-652.html | 0 .../cypress/fixtures/jquery-3.2.1.js | 0 .../{test => }/cypress/fixtures/jquery.html | 0 .../cypress/fixtures/js-redirect-timeout.html | 0 .../cypress/fixtures/js-redirect.html | 0 .../cypress/fixtures/media/small.mp4 | Bin .../fixtures/meta-redirect-timeout.html | 0 .../cypress/fixtures/meta-redirect.html | 0 .../{test => }/cypress/fixtures/mui.html | 0 .../cypress/fixtures/nested/with_paths.css | 0 .../{test => }/cypress/fixtures/no_html.html | 0 .../{test => }/cypress/fixtures/null.json | 0 .../fixtures/problematic-source-map-urls.txt | 0 .../{test => }/cypress/fixtures/react-15.html | 0 .../{test => }/cypress/fixtures/react-16.html | 0 .../cypress/fixtures/screenshots.html | 0 .../cypress/fixtures/scrolling.html | 0 .../{test => }/cypress/fixtures/security.html | 0 .../{test => }/cypress/fixtures/security.js | 0 .../cypress/fixtures/shadow-dom.html | 0 .../{test => }/cypress/fixtures/sinon.html | 0 .../cypress/fixtures/sync_error.html | 0 .../cypress/fixtures/text-mask.html | 0 .../{test => }/cypress/fixtures/type.html | 0 .../{test => }/cypress/fixtures/valid.json | 0 .../{test => }/cypress/fixtures/video.html | 0 .../cypress/fixtures/visibility.html | 0 .../cypress/fixtures/visit_error.html | 0 .../{test => }/cypress/fixtures/webcam.html | 0 .../{test => }/cypress/fixtures/wtf.html | 0 .../cypress/fixtures/xhr-triggered.html | 0 .../{test => }/cypress/fixtures/xhr.html | 0 .../{test => }/cypress/fixtures/yaml.yaml | 0 .../{test => }/cypress/fixtures/zonejs.html | 0 .../commands/actions/check_spec.js | 0 .../commands/actions/clear_spec.js | 0 .../commands/actions/click_spec.js | 0 .../commands/actions/focus_spec.js | 0 .../commands/actions/hover_spec.js | 0 .../commands/actions/scroll_spec.js | 0 .../commands/actions/select_spec.js | 0 .../commands/actions/submit_spec.js | 0 .../commands/actions/trigger_spec.js | 0 .../commands/actions/type_errors_spec.js | 0 .../integration/commands/actions/type_spec.js | 0 .../actions/type_special_chars_spec.js | 0 .../integration/commands/agents_spec.js | 0 .../integration/commands/aliasing_spec.js | 0 .../integration/commands/angular_spec.js | 0 .../integration/commands/assertions_spec.js | 0 .../integration/commands/clock_spec.js | 0 .../commands/command_option_immutability.js | 0 .../integration/commands/commands_spec.js | 0 .../integration/commands/connectors_spec.js | 0 .../integration/commands/cookies_spec.js | 0 .../integration/commands/debugging_spec.js | 0 .../cypress/integration/commands/exec_spec.js | 0 .../integration/commands/files_spec.js | 0 .../integration/commands/fixtures_spec.js | 0 .../commands/local_storage_spec.js | 0 .../integration/commands/location_spec.js | 0 .../cypress/integration/commands/misc_spec.js | 0 .../integration/commands/navigation_spec.js | 0 .../integration/commands/popups_spec.js | 0 .../integration/commands/querying_spec.js | 0 .../integration/commands/request_spec.js | 0 .../integration/commands/screenshot_spec.js | 0 .../cypress/integration/commands/task_spec.js | 0 .../integration/commands/traversals_spec.js | 0 .../integration/commands/waiting_spec.js | 0 .../integration/commands/window_spec.js | 0 .../cypress/integration/commands/xhr_spec.js | 6 ++-- .../integration/cy/snapshot_css_spec.js | 2 +- .../cypress/integration/cy/snapshot_spec.js | 0 .../cypress/integration/cy/timeouts_spec.js | 2 +- .../cypress/integration/cy/timers_spec.js | 0 .../integration/cypress/browser_spec.js | 2 +- .../cypress/integration/cypress/cy_spec.js | 0 .../integration/cypress/cypress_spec.js | 0 .../integration/cypress/error_utils_spec.js | 6 ++-- .../integration/cypress/location_spec.js | 0 .../cypress/integration/cypress/log_spec.js | 2 +- .../integration/cypress/network_utils_spec.js | 2 +- .../integration/cypress/resolvers_spec.ts | 0 .../integration/cypress/runner_spec.js | 0 .../integration/cypress/screenshot_spec.js | 0 .../integration/cypress/script_utils_spec.js | 6 ++-- .../cypress/selector_playground_spec.js | 0 .../cypress/source_map_utils_spec.js | 2 +- .../integration/cypress/stack_utils_spec.js | 4 +-- .../cypress/integration/cypress/utils_spec.js | 2 +- .../cypress/xml_http_request_spec.js | 2 +- .../integration/dom/coordinates_spec.ts | 0 .../cypress/integration/dom/elements_spec.ts | 0 .../cypress/integration/dom/jquery_spec.ts | 0 .../integration/dom/visibility_spec.ts | 0 .../abort_beforeunload_event_child_spec.ts | 0 .../e2e/abort_beforeunload_event_spec.ts | 0 .../e2e/abort_onbeforeunload_child_spec.ts | 0 .../e2e/abort_onbeforeunload_spec.ts | 0 .../integration/e2e/cancelation_spec.js | 0 .../integration/e2e/dom_hitbox.spec.js | 0 .../integration/e2e/ended_early_spec.js | 0 .../integration/e2e/focus_blur_spec.js | 1 - .../cypress/integration/e2e/keyboard_spec.js | 0 .../cypress/integration/e2e/promises_spec.js | 0 .../cypress/integration/e2e/react-15_spec.js | 0 .../cypress/integration/e2e/react-16_spec.js | 0 .../cypress/integration/e2e/redirects_spec.js | 0 .../cypress/integration/e2e/rerun_spec.js | 0 .../integration/e2e/return_value_spec.js | 0 .../cypress/integration/e2e/security_spec.js | 0 .../e2e/selector_playground.spec.js | 0 .../e2e/testConfigOverrides.spec.js | 0 .../cypress/integration/e2e/text_mask_spec.js | 0 .../integration/e2e/uncaught_errors_spec.js | 0 .../cypress/integration/e2e/video_spec.js | 0 .../integration/e2e/visibility_spec.js | 0 .../cypress/integration/e2e/webcam_spec.js | 0 .../cypress/integration/e2e/zonejs_spec.js | 0 .../cypress/integration/issues/1436_spec.js | 0 .../cypress/integration/issues/1854_spec.js | 0 .../cypress/integration/issues/1909_spec.js | 0 .../integration/issues/1939_1940_2190_spec.js | 0 .../cypress/integration/issues/2582_spec.js | 0 .../cypress/integration/issues/2784_spec.js | 0 .../cypress/integration/issues/2850_spec.js | 0 .../cypress/integration/issues/3253_spec.js | 0 .../cypress/integration/issues/3847_spec.js | 0 .../cypress/integration/issues/4373_spec.js | 0 .../cypress/integration/issues/510_spec.js | 0 .../cypress/integration/issues/565_spec.js | 0 .../cypress/integration/issues/5682_spec.js | 0 .../cypress/integration/issues/5707_spec.js | 0 .../cypress/integration/issues/573_spec.js | 0 .../cypress/integration/issues/599_spec.js | 0 .../cypress/integration/issues/652_spec.js | 0 .../integration/issues/761_2968_3973_spec.js | 0 .../util/firefox_forced_gc_spec.ts | 2 +- .../integration/util/limited_map_spec.js | 2 +- .../{test => }/cypress/plugins/index.js | 2 +- .../support => cypress/plugins}/server.js | 13 ++++--- .../{test => }/cypress/support/defaults.js | 0 .../{test => }/cypress/support/helpers.js | 0 .../{test => }/cypress/support/index.js | 0 .../{test => }/cypress/support/utils.js | 0 packages/driver/index.d.ts | 2 +- packages/driver/package.json | 6 ++-- packages/driver/src/config/lodash.d.ts | 33 ------------------ packages/driver/src/cy/chai.js | 2 +- packages/driver/test/cypress/.eslintrc.json | 8 ----- .../driver/test/support/unit_spec_helper.js | 25 ------------- packages/driver/test/support/watch | 3 -- packages/driver/tsconfig.json | 8 +++-- .../driver/{ts => types}/internal-types.d.ts | 0 packages/runner/jsconfig.json | 5 --- packages/runner/tsconfig.json | 5 +-- packages/server/test/e2e/8_error_ui_spec.ts | 4 +-- 200 files changed, 61 insertions(+), 141 deletions(-) rename packages/driver/{test => }/cypress.json (58%) rename packages/driver/{test => cypress}/.eslintrc.json (58%) rename packages/driver/{test => }/cypress/fixtures/active-elements.html (100%) rename packages/driver/{test => }/cypress/fixtures/angular.html (100%) rename packages/driver/{test => }/cypress/fixtures/app.js (100%) rename packages/driver/{test => }/cypress/fixtures/app.json (100%) rename packages/driver/{test => }/cypress/fixtures/blocking_beforeunload_event.html (100%) rename packages/driver/{test => }/cypress/fixtures/blocking_onbeforeunload.html (100%) rename packages/driver/{test => }/cypress/fixtures/comma-separated.csv (100%) rename packages/driver/{test => }/cypress/fixtures/command-log.html (100%) rename packages/driver/{test => }/cypress/fixtures/commands.html (100%) rename packages/driver/{test => }/cypress/fixtures/cross_origin.html (100%) rename packages/driver/{test => }/cypress/fixtures/cross_origin_name.html (100%) rename packages/driver/{test => }/cypress/fixtures/dangling-element.html (100%) rename packages/driver/{test => }/cypress/fixtures/dimensions.html (100%) rename packages/driver/{test => }/cypress/fixtures/dom.html (100%) rename packages/driver/{test => }/cypress/fixtures/dropdown.html (100%) rename packages/driver/{test => }/cypress/fixtures/example.json (100%) rename packages/driver/{test => }/cypress/fixtures/fixed-nav.html (100%) rename packages/driver/{test => }/cypress/fixtures/foo.bar.baz.json (100%) rename packages/driver/{test => }/cypress/fixtures/form.html (100%) rename packages/driver/{test => }/cypress/fixtures/generic.html (100%) rename packages/driver/{test => }/cypress/fixtures/generic_styles.css (100%) rename packages/driver/{test => }/cypress/fixtures/generic_styles_2.css (100%) rename packages/driver/{test => }/cypress/fixtures/generic_styles_3.css (100%) rename packages/driver/{test => }/cypress/fixtures/generic_styles_print.css (100%) rename packages/driver/{test => }/cypress/fixtures/global-error.html (100%) rename packages/driver/{test => }/cypress/fixtures/hook_uncaught.html (100%) rename packages/driver/{test => }/cypress/fixtures/iframe-inner.html (100%) rename packages/driver/{test => }/cypress/fixtures/iframe-outer.html (100%) rename packages/driver/{test => }/cypress/fixtures/invalid_html.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-1436.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-2956.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-4373.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-565.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-5682.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-5707.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-599.html (100%) rename packages/driver/{test => }/cypress/fixtures/issue-652.html (100%) rename packages/driver/{test => }/cypress/fixtures/jquery-3.2.1.js (100%) rename packages/driver/{test => }/cypress/fixtures/jquery.html (100%) rename packages/driver/{test => }/cypress/fixtures/js-redirect-timeout.html (100%) rename packages/driver/{test => }/cypress/fixtures/js-redirect.html (100%) rename packages/driver/{test => }/cypress/fixtures/media/small.mp4 (100%) rename packages/driver/{test => }/cypress/fixtures/meta-redirect-timeout.html (100%) rename packages/driver/{test => }/cypress/fixtures/meta-redirect.html (100%) rename packages/driver/{test => }/cypress/fixtures/mui.html (100%) rename packages/driver/{test => }/cypress/fixtures/nested/with_paths.css (100%) rename packages/driver/{test => }/cypress/fixtures/no_html.html (100%) rename packages/driver/{test => }/cypress/fixtures/null.json (100%) rename packages/driver/{test => }/cypress/fixtures/problematic-source-map-urls.txt (100%) rename packages/driver/{test => }/cypress/fixtures/react-15.html (100%) rename packages/driver/{test => }/cypress/fixtures/react-16.html (100%) rename packages/driver/{test => }/cypress/fixtures/screenshots.html (100%) rename packages/driver/{test => }/cypress/fixtures/scrolling.html (100%) rename packages/driver/{test => }/cypress/fixtures/security.html (100%) rename packages/driver/{test => }/cypress/fixtures/security.js (100%) rename packages/driver/{test => }/cypress/fixtures/shadow-dom.html (100%) rename packages/driver/{test => }/cypress/fixtures/sinon.html (100%) rename packages/driver/{test => }/cypress/fixtures/sync_error.html (100%) rename packages/driver/{test => }/cypress/fixtures/text-mask.html (100%) rename packages/driver/{test => }/cypress/fixtures/type.html (100%) rename packages/driver/{test => }/cypress/fixtures/valid.json (100%) rename packages/driver/{test => }/cypress/fixtures/video.html (100%) rename packages/driver/{test => }/cypress/fixtures/visibility.html (100%) rename packages/driver/{test => }/cypress/fixtures/visit_error.html (100%) rename packages/driver/{test => }/cypress/fixtures/webcam.html (100%) rename packages/driver/{test => }/cypress/fixtures/wtf.html (100%) rename packages/driver/{test => }/cypress/fixtures/xhr-triggered.html (100%) rename packages/driver/{test => }/cypress/fixtures/xhr.html (100%) rename packages/driver/{test => }/cypress/fixtures/yaml.yaml (100%) rename packages/driver/{test => }/cypress/fixtures/zonejs.html (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/check_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/clear_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/click_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/focus_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/hover_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/scroll_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/select_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/submit_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/trigger_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/type_errors_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/type_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/actions/type_special_chars_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/agents_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/aliasing_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/angular_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/assertions_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/clock_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/command_option_immutability.js (100%) rename packages/driver/{test => }/cypress/integration/commands/commands_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/connectors_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/cookies_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/debugging_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/exec_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/files_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/fixtures_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/local_storage_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/location_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/misc_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/navigation_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/popups_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/querying_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/request_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/screenshot_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/task_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/traversals_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/waiting_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/window_spec.js (100%) rename packages/driver/{test => }/cypress/integration/commands/xhr_spec.js (99%) rename packages/driver/{test => }/cypress/integration/cy/snapshot_css_spec.js (99%) rename packages/driver/{test => }/cypress/integration/cy/snapshot_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cy/timeouts_spec.js (95%) rename packages/driver/{test => }/cypress/integration/cy/timers_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/browser_spec.js (97%) rename packages/driver/{test => }/cypress/integration/cypress/cy_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/cypress_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/error_utils_spec.js (98%) rename packages/driver/{test => }/cypress/integration/cypress/location_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/log_spec.js (95%) rename packages/driver/{test => }/cypress/integration/cypress/network_utils_spec.js (94%) rename packages/driver/{test => }/cypress/integration/cypress/resolvers_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/cypress/runner_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/screenshot_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/script_utils_spec.js (88%) rename packages/driver/{test => }/cypress/integration/cypress/selector_playground_spec.js (100%) rename packages/driver/{test => }/cypress/integration/cypress/source_map_utils_spec.js (98%) rename packages/driver/{test => }/cypress/integration/cypress/stack_utils_spec.js (98%) rename packages/driver/{test => }/cypress/integration/cypress/utils_spec.js (98%) rename packages/driver/{test => }/cypress/integration/cypress/xml_http_request_spec.js (92%) rename packages/driver/{test => }/cypress/integration/dom/coordinates_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/dom/elements_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/dom/jquery_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/dom/visibility_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/e2e/abort_beforeunload_event_child_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/e2e/abort_beforeunload_event_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/e2e/abort_onbeforeunload_child_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/e2e/abort_onbeforeunload_spec.ts (100%) rename packages/driver/{test => }/cypress/integration/e2e/cancelation_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/dom_hitbox.spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/ended_early_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/focus_blur_spec.js (99%) rename packages/driver/{test => }/cypress/integration/e2e/keyboard_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/promises_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/react-15_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/react-16_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/redirects_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/rerun_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/return_value_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/security_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/selector_playground.spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/testConfigOverrides.spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/text_mask_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/uncaught_errors_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/video_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/visibility_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/webcam_spec.js (100%) rename packages/driver/{test => }/cypress/integration/e2e/zonejs_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/1436_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/1854_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/1909_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/1939_1940_2190_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/2582_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/2784_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/2850_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/3253_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/3847_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/4373_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/510_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/565_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/5682_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/5707_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/573_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/599_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/652_spec.js (100%) rename packages/driver/{test => }/cypress/integration/issues/761_2968_3973_spec.js (100%) rename packages/driver/{test => }/cypress/integration/util/firefox_forced_gc_spec.ts (98%) rename packages/driver/{test => }/cypress/integration/util/limited_map_spec.js (96%) rename packages/driver/{test => }/cypress/plugins/index.js (98%) rename packages/driver/{test/support => cypress/plugins}/server.js (89%) rename packages/driver/{test => }/cypress/support/defaults.js (100%) rename packages/driver/{test => }/cypress/support/helpers.js (100%) rename packages/driver/{test => }/cypress/support/index.js (100%) rename packages/driver/{test => }/cypress/support/utils.js (100%) delete mode 100644 packages/driver/src/config/lodash.d.ts delete mode 100644 packages/driver/test/cypress/.eslintrc.json delete mode 100644 packages/driver/test/support/unit_spec_helper.js delete mode 100755 packages/driver/test/support/watch rename packages/driver/{ts => types}/internal-types.d.ts (100%) delete mode 100644 packages/runner/jsconfig.json diff --git a/.gitignore b/.gitignore index f6c53b9cacbb..2fec763ebab1 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,8 @@ packages/desktop-gui/cypress/videos packages/desktop-gui/src/jsconfig.json # from driver -packages/driver/test/cypress/videos -packages/driver/test/cypress/screenshots +packages/driver/cypress/videos +packages/driver/cypress/screenshots # from example packages/example/app diff --git a/circle.yml b/circle.yml index 13db64d9c0c8..6966d8f3b0f5 100644 --- a/circle.yml +++ b/circle.yml @@ -95,12 +95,6 @@ commands: steps: - attach_workspace: at: ~/ - - run: - command: yarn start - background: true - working_directory: packages/driver - - run: - command: yarn wait-on http://localhost:3500 - run: environment: CYPRESS_KONFIG_ENV: production @@ -114,7 +108,7 @@ commands: yarn cypress:run --record --parallel --group 5x-driver-<< parameters.browser >> --browser << parameters.browser >> else # external PR - TESTFILES=$(circleci tests glob "test/cypress/integration/**/*_spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) + TESTFILES=$(circleci tests glob "cypress/integration/**/*_spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" if [[ -z "$TESTFILES" ]]; then @@ -200,10 +194,6 @@ commands: description: Test command to run to start Cypress tests type: string default: "npm run e2e" - wait-on: - description: Url to wait-on before starting tests - type: string - default: "" # if the repo to clone and test is a monorepo, you can # run tests inside a specific subfolder folder: @@ -256,12 +246,6 @@ commands: working_directory: /tmp/<> command: npm start --if-present background: true - - when: - condition: <> - steps: - - run: - name: Wait-on <> - command: npx wait-on <> --timeout 120000 - when: condition: << parameters.folder >> steps: @@ -1318,7 +1302,6 @@ jobs: repo: cypress-documentation browser: firefox command: "npm run cypress:run" - wait-on: "http://localhost:2222" "test-binary-against-realworld-firefox": <<: *defaults @@ -1327,7 +1310,6 @@ jobs: repo: cypress-example-realworld browser: firefox command: "npm run cypress:run" - wait-on: "http://localhost:4100" "test-binary-against-api-testing-firefox": <<: *defaults @@ -1336,7 +1318,6 @@ jobs: repo: cypress-example-api-testing browser: firefox command: "npm run cy:run" - wait-on: "http://localhost:3000" "test-binary-against-piechopper-firefox": <<: *defaults @@ -1345,7 +1326,6 @@ jobs: repo: cypress-example-piechopper browser: firefox command: "npm run cypress:run" - wait-on: "http://localhost:8080" test-binary-as-specific-user: <<: *defaults diff --git a/package.json b/package.json index 6b4d76a22eb9..c7dca292f365 100644 --- a/package.json +++ b/package.json @@ -184,8 +184,7 @@ "terminal-banner": "1.1.0", "through": "2.3.8", "ts-node": "8.3.0", - "typescript": "3.7.4", - "wait-on": "3.3.0" + "typescript": "3.7.4" }, "engines": { "node": ">=12.8.1", diff --git a/packages/driver/.gitignore b/packages/driver/.gitignore index 1404cb71a490..944d461994e6 100644 --- a/packages/driver/.gitignore +++ b/packages/driver/.gitignore @@ -1,2 +1,2 @@ -test/cypress/videos -test/cypress/screenshots +cypress/videos +cypress/screenshots diff --git a/packages/driver/test/cypress.json b/packages/driver/cypress.json similarity index 58% rename from packages/driver/test/cypress.json rename to packages/driver/cypress.json index ed128fb0a96f..7eac07ef42f9 100644 --- a/packages/driver/test/cypress.json +++ b/packages/driver/cypress.json @@ -4,9 +4,9 @@ "hosts": { "*.foobar.com": "127.0.0.1" }, - "reporter": "../../../node_modules/cypress-multi-reporters/index.js", + "reporter": "cypress-multi-reporters", "reporterOptions": { - "configFile": "../../../mocha-reporter-config.json" + "configFile": "../../mocha-reporter-config.json" }, "experimentalShadowDomSupport": true } diff --git a/packages/driver/test/.eslintrc.json b/packages/driver/cypress/.eslintrc.json similarity index 58% rename from packages/driver/test/.eslintrc.json rename to packages/driver/cypress/.eslintrc.json index f7cfa5c3a5fe..9b012d59420f 100644 --- a/packages/driver/test/.eslintrc.json +++ b/packages/driver/cypress/.eslintrc.json @@ -1,7 +1,13 @@ { + "plugins": [ + "cypress" + ], "extends": [ "plugin:@cypress/dev/tests" ], + "env": { + "cypress/globals": true + }, "rules": { "mocha/no-global-tests": "off" } diff --git a/packages/driver/test/cypress/fixtures/active-elements.html b/packages/driver/cypress/fixtures/active-elements.html similarity index 100% rename from packages/driver/test/cypress/fixtures/active-elements.html rename to packages/driver/cypress/fixtures/active-elements.html diff --git a/packages/driver/test/cypress/fixtures/angular.html b/packages/driver/cypress/fixtures/angular.html similarity index 100% rename from packages/driver/test/cypress/fixtures/angular.html rename to packages/driver/cypress/fixtures/angular.html diff --git a/packages/driver/test/cypress/fixtures/app.js b/packages/driver/cypress/fixtures/app.js similarity index 100% rename from packages/driver/test/cypress/fixtures/app.js rename to packages/driver/cypress/fixtures/app.js diff --git a/packages/driver/test/cypress/fixtures/app.json b/packages/driver/cypress/fixtures/app.json similarity index 100% rename from packages/driver/test/cypress/fixtures/app.json rename to packages/driver/cypress/fixtures/app.json diff --git a/packages/driver/test/cypress/fixtures/blocking_beforeunload_event.html b/packages/driver/cypress/fixtures/blocking_beforeunload_event.html similarity index 100% rename from packages/driver/test/cypress/fixtures/blocking_beforeunload_event.html rename to packages/driver/cypress/fixtures/blocking_beforeunload_event.html diff --git a/packages/driver/test/cypress/fixtures/blocking_onbeforeunload.html b/packages/driver/cypress/fixtures/blocking_onbeforeunload.html similarity index 100% rename from packages/driver/test/cypress/fixtures/blocking_onbeforeunload.html rename to packages/driver/cypress/fixtures/blocking_onbeforeunload.html diff --git a/packages/driver/test/cypress/fixtures/comma-separated.csv b/packages/driver/cypress/fixtures/comma-separated.csv similarity index 100% rename from packages/driver/test/cypress/fixtures/comma-separated.csv rename to packages/driver/cypress/fixtures/comma-separated.csv diff --git a/packages/driver/test/cypress/fixtures/command-log.html b/packages/driver/cypress/fixtures/command-log.html similarity index 100% rename from packages/driver/test/cypress/fixtures/command-log.html rename to packages/driver/cypress/fixtures/command-log.html diff --git a/packages/driver/test/cypress/fixtures/commands.html b/packages/driver/cypress/fixtures/commands.html similarity index 100% rename from packages/driver/test/cypress/fixtures/commands.html rename to packages/driver/cypress/fixtures/commands.html diff --git a/packages/driver/test/cypress/fixtures/cross_origin.html b/packages/driver/cypress/fixtures/cross_origin.html similarity index 100% rename from packages/driver/test/cypress/fixtures/cross_origin.html rename to packages/driver/cypress/fixtures/cross_origin.html diff --git a/packages/driver/test/cypress/fixtures/cross_origin_name.html b/packages/driver/cypress/fixtures/cross_origin_name.html similarity index 100% rename from packages/driver/test/cypress/fixtures/cross_origin_name.html rename to packages/driver/cypress/fixtures/cross_origin_name.html diff --git a/packages/driver/test/cypress/fixtures/dangling-element.html b/packages/driver/cypress/fixtures/dangling-element.html similarity index 100% rename from packages/driver/test/cypress/fixtures/dangling-element.html rename to packages/driver/cypress/fixtures/dangling-element.html diff --git a/packages/driver/test/cypress/fixtures/dimensions.html b/packages/driver/cypress/fixtures/dimensions.html similarity index 100% rename from packages/driver/test/cypress/fixtures/dimensions.html rename to packages/driver/cypress/fixtures/dimensions.html diff --git a/packages/driver/test/cypress/fixtures/dom.html b/packages/driver/cypress/fixtures/dom.html similarity index 100% rename from packages/driver/test/cypress/fixtures/dom.html rename to packages/driver/cypress/fixtures/dom.html diff --git a/packages/driver/test/cypress/fixtures/dropdown.html b/packages/driver/cypress/fixtures/dropdown.html similarity index 100% rename from packages/driver/test/cypress/fixtures/dropdown.html rename to packages/driver/cypress/fixtures/dropdown.html diff --git a/packages/driver/test/cypress/fixtures/example.json b/packages/driver/cypress/fixtures/example.json similarity index 100% rename from packages/driver/test/cypress/fixtures/example.json rename to packages/driver/cypress/fixtures/example.json diff --git a/packages/driver/test/cypress/fixtures/fixed-nav.html b/packages/driver/cypress/fixtures/fixed-nav.html similarity index 100% rename from packages/driver/test/cypress/fixtures/fixed-nav.html rename to packages/driver/cypress/fixtures/fixed-nav.html diff --git a/packages/driver/test/cypress/fixtures/foo.bar.baz.json b/packages/driver/cypress/fixtures/foo.bar.baz.json similarity index 100% rename from packages/driver/test/cypress/fixtures/foo.bar.baz.json rename to packages/driver/cypress/fixtures/foo.bar.baz.json diff --git a/packages/driver/test/cypress/fixtures/form.html b/packages/driver/cypress/fixtures/form.html similarity index 100% rename from packages/driver/test/cypress/fixtures/form.html rename to packages/driver/cypress/fixtures/form.html diff --git a/packages/driver/test/cypress/fixtures/generic.html b/packages/driver/cypress/fixtures/generic.html similarity index 100% rename from packages/driver/test/cypress/fixtures/generic.html rename to packages/driver/cypress/fixtures/generic.html diff --git a/packages/driver/test/cypress/fixtures/generic_styles.css b/packages/driver/cypress/fixtures/generic_styles.css similarity index 100% rename from packages/driver/test/cypress/fixtures/generic_styles.css rename to packages/driver/cypress/fixtures/generic_styles.css diff --git a/packages/driver/test/cypress/fixtures/generic_styles_2.css b/packages/driver/cypress/fixtures/generic_styles_2.css similarity index 100% rename from packages/driver/test/cypress/fixtures/generic_styles_2.css rename to packages/driver/cypress/fixtures/generic_styles_2.css diff --git a/packages/driver/test/cypress/fixtures/generic_styles_3.css b/packages/driver/cypress/fixtures/generic_styles_3.css similarity index 100% rename from packages/driver/test/cypress/fixtures/generic_styles_3.css rename to packages/driver/cypress/fixtures/generic_styles_3.css diff --git a/packages/driver/test/cypress/fixtures/generic_styles_print.css b/packages/driver/cypress/fixtures/generic_styles_print.css similarity index 100% rename from packages/driver/test/cypress/fixtures/generic_styles_print.css rename to packages/driver/cypress/fixtures/generic_styles_print.css diff --git a/packages/driver/test/cypress/fixtures/global-error.html b/packages/driver/cypress/fixtures/global-error.html similarity index 100% rename from packages/driver/test/cypress/fixtures/global-error.html rename to packages/driver/cypress/fixtures/global-error.html diff --git a/packages/driver/test/cypress/fixtures/hook_uncaught.html b/packages/driver/cypress/fixtures/hook_uncaught.html similarity index 100% rename from packages/driver/test/cypress/fixtures/hook_uncaught.html rename to packages/driver/cypress/fixtures/hook_uncaught.html diff --git a/packages/driver/test/cypress/fixtures/iframe-inner.html b/packages/driver/cypress/fixtures/iframe-inner.html similarity index 100% rename from packages/driver/test/cypress/fixtures/iframe-inner.html rename to packages/driver/cypress/fixtures/iframe-inner.html diff --git a/packages/driver/test/cypress/fixtures/iframe-outer.html b/packages/driver/cypress/fixtures/iframe-outer.html similarity index 100% rename from packages/driver/test/cypress/fixtures/iframe-outer.html rename to packages/driver/cypress/fixtures/iframe-outer.html diff --git a/packages/driver/test/cypress/fixtures/invalid_html.html b/packages/driver/cypress/fixtures/invalid_html.html similarity index 100% rename from packages/driver/test/cypress/fixtures/invalid_html.html rename to packages/driver/cypress/fixtures/invalid_html.html diff --git a/packages/driver/test/cypress/fixtures/issue-1436.html b/packages/driver/cypress/fixtures/issue-1436.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-1436.html rename to packages/driver/cypress/fixtures/issue-1436.html diff --git a/packages/driver/test/cypress/fixtures/issue-2956.html b/packages/driver/cypress/fixtures/issue-2956.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-2956.html rename to packages/driver/cypress/fixtures/issue-2956.html diff --git a/packages/driver/test/cypress/fixtures/issue-4373.html b/packages/driver/cypress/fixtures/issue-4373.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-4373.html rename to packages/driver/cypress/fixtures/issue-4373.html diff --git a/packages/driver/test/cypress/fixtures/issue-565.html b/packages/driver/cypress/fixtures/issue-565.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-565.html rename to packages/driver/cypress/fixtures/issue-565.html diff --git a/packages/driver/test/cypress/fixtures/issue-5682.html b/packages/driver/cypress/fixtures/issue-5682.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-5682.html rename to packages/driver/cypress/fixtures/issue-5682.html diff --git a/packages/driver/test/cypress/fixtures/issue-5707.html b/packages/driver/cypress/fixtures/issue-5707.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-5707.html rename to packages/driver/cypress/fixtures/issue-5707.html diff --git a/packages/driver/test/cypress/fixtures/issue-599.html b/packages/driver/cypress/fixtures/issue-599.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-599.html rename to packages/driver/cypress/fixtures/issue-599.html diff --git a/packages/driver/test/cypress/fixtures/issue-652.html b/packages/driver/cypress/fixtures/issue-652.html similarity index 100% rename from packages/driver/test/cypress/fixtures/issue-652.html rename to packages/driver/cypress/fixtures/issue-652.html diff --git a/packages/driver/test/cypress/fixtures/jquery-3.2.1.js b/packages/driver/cypress/fixtures/jquery-3.2.1.js similarity index 100% rename from packages/driver/test/cypress/fixtures/jquery-3.2.1.js rename to packages/driver/cypress/fixtures/jquery-3.2.1.js diff --git a/packages/driver/test/cypress/fixtures/jquery.html b/packages/driver/cypress/fixtures/jquery.html similarity index 100% rename from packages/driver/test/cypress/fixtures/jquery.html rename to packages/driver/cypress/fixtures/jquery.html diff --git a/packages/driver/test/cypress/fixtures/js-redirect-timeout.html b/packages/driver/cypress/fixtures/js-redirect-timeout.html similarity index 100% rename from packages/driver/test/cypress/fixtures/js-redirect-timeout.html rename to packages/driver/cypress/fixtures/js-redirect-timeout.html diff --git a/packages/driver/test/cypress/fixtures/js-redirect.html b/packages/driver/cypress/fixtures/js-redirect.html similarity index 100% rename from packages/driver/test/cypress/fixtures/js-redirect.html rename to packages/driver/cypress/fixtures/js-redirect.html diff --git a/packages/driver/test/cypress/fixtures/media/small.mp4 b/packages/driver/cypress/fixtures/media/small.mp4 similarity index 100% rename from packages/driver/test/cypress/fixtures/media/small.mp4 rename to packages/driver/cypress/fixtures/media/small.mp4 diff --git a/packages/driver/test/cypress/fixtures/meta-redirect-timeout.html b/packages/driver/cypress/fixtures/meta-redirect-timeout.html similarity index 100% rename from packages/driver/test/cypress/fixtures/meta-redirect-timeout.html rename to packages/driver/cypress/fixtures/meta-redirect-timeout.html diff --git a/packages/driver/test/cypress/fixtures/meta-redirect.html b/packages/driver/cypress/fixtures/meta-redirect.html similarity index 100% rename from packages/driver/test/cypress/fixtures/meta-redirect.html rename to packages/driver/cypress/fixtures/meta-redirect.html diff --git a/packages/driver/test/cypress/fixtures/mui.html b/packages/driver/cypress/fixtures/mui.html similarity index 100% rename from packages/driver/test/cypress/fixtures/mui.html rename to packages/driver/cypress/fixtures/mui.html diff --git a/packages/driver/test/cypress/fixtures/nested/with_paths.css b/packages/driver/cypress/fixtures/nested/with_paths.css similarity index 100% rename from packages/driver/test/cypress/fixtures/nested/with_paths.css rename to packages/driver/cypress/fixtures/nested/with_paths.css diff --git a/packages/driver/test/cypress/fixtures/no_html.html b/packages/driver/cypress/fixtures/no_html.html similarity index 100% rename from packages/driver/test/cypress/fixtures/no_html.html rename to packages/driver/cypress/fixtures/no_html.html diff --git a/packages/driver/test/cypress/fixtures/null.json b/packages/driver/cypress/fixtures/null.json similarity index 100% rename from packages/driver/test/cypress/fixtures/null.json rename to packages/driver/cypress/fixtures/null.json diff --git a/packages/driver/test/cypress/fixtures/problematic-source-map-urls.txt b/packages/driver/cypress/fixtures/problematic-source-map-urls.txt similarity index 100% rename from packages/driver/test/cypress/fixtures/problematic-source-map-urls.txt rename to packages/driver/cypress/fixtures/problematic-source-map-urls.txt diff --git a/packages/driver/test/cypress/fixtures/react-15.html b/packages/driver/cypress/fixtures/react-15.html similarity index 100% rename from packages/driver/test/cypress/fixtures/react-15.html rename to packages/driver/cypress/fixtures/react-15.html diff --git a/packages/driver/test/cypress/fixtures/react-16.html b/packages/driver/cypress/fixtures/react-16.html similarity index 100% rename from packages/driver/test/cypress/fixtures/react-16.html rename to packages/driver/cypress/fixtures/react-16.html diff --git a/packages/driver/test/cypress/fixtures/screenshots.html b/packages/driver/cypress/fixtures/screenshots.html similarity index 100% rename from packages/driver/test/cypress/fixtures/screenshots.html rename to packages/driver/cypress/fixtures/screenshots.html diff --git a/packages/driver/test/cypress/fixtures/scrolling.html b/packages/driver/cypress/fixtures/scrolling.html similarity index 100% rename from packages/driver/test/cypress/fixtures/scrolling.html rename to packages/driver/cypress/fixtures/scrolling.html diff --git a/packages/driver/test/cypress/fixtures/security.html b/packages/driver/cypress/fixtures/security.html similarity index 100% rename from packages/driver/test/cypress/fixtures/security.html rename to packages/driver/cypress/fixtures/security.html diff --git a/packages/driver/test/cypress/fixtures/security.js b/packages/driver/cypress/fixtures/security.js similarity index 100% rename from packages/driver/test/cypress/fixtures/security.js rename to packages/driver/cypress/fixtures/security.js diff --git a/packages/driver/test/cypress/fixtures/shadow-dom.html b/packages/driver/cypress/fixtures/shadow-dom.html similarity index 100% rename from packages/driver/test/cypress/fixtures/shadow-dom.html rename to packages/driver/cypress/fixtures/shadow-dom.html diff --git a/packages/driver/test/cypress/fixtures/sinon.html b/packages/driver/cypress/fixtures/sinon.html similarity index 100% rename from packages/driver/test/cypress/fixtures/sinon.html rename to packages/driver/cypress/fixtures/sinon.html diff --git a/packages/driver/test/cypress/fixtures/sync_error.html b/packages/driver/cypress/fixtures/sync_error.html similarity index 100% rename from packages/driver/test/cypress/fixtures/sync_error.html rename to packages/driver/cypress/fixtures/sync_error.html diff --git a/packages/driver/test/cypress/fixtures/text-mask.html b/packages/driver/cypress/fixtures/text-mask.html similarity index 100% rename from packages/driver/test/cypress/fixtures/text-mask.html rename to packages/driver/cypress/fixtures/text-mask.html diff --git a/packages/driver/test/cypress/fixtures/type.html b/packages/driver/cypress/fixtures/type.html similarity index 100% rename from packages/driver/test/cypress/fixtures/type.html rename to packages/driver/cypress/fixtures/type.html diff --git a/packages/driver/test/cypress/fixtures/valid.json b/packages/driver/cypress/fixtures/valid.json similarity index 100% rename from packages/driver/test/cypress/fixtures/valid.json rename to packages/driver/cypress/fixtures/valid.json diff --git a/packages/driver/test/cypress/fixtures/video.html b/packages/driver/cypress/fixtures/video.html similarity index 100% rename from packages/driver/test/cypress/fixtures/video.html rename to packages/driver/cypress/fixtures/video.html diff --git a/packages/driver/test/cypress/fixtures/visibility.html b/packages/driver/cypress/fixtures/visibility.html similarity index 100% rename from packages/driver/test/cypress/fixtures/visibility.html rename to packages/driver/cypress/fixtures/visibility.html diff --git a/packages/driver/test/cypress/fixtures/visit_error.html b/packages/driver/cypress/fixtures/visit_error.html similarity index 100% rename from packages/driver/test/cypress/fixtures/visit_error.html rename to packages/driver/cypress/fixtures/visit_error.html diff --git a/packages/driver/test/cypress/fixtures/webcam.html b/packages/driver/cypress/fixtures/webcam.html similarity index 100% rename from packages/driver/test/cypress/fixtures/webcam.html rename to packages/driver/cypress/fixtures/webcam.html diff --git a/packages/driver/test/cypress/fixtures/wtf.html b/packages/driver/cypress/fixtures/wtf.html similarity index 100% rename from packages/driver/test/cypress/fixtures/wtf.html rename to packages/driver/cypress/fixtures/wtf.html diff --git a/packages/driver/test/cypress/fixtures/xhr-triggered.html b/packages/driver/cypress/fixtures/xhr-triggered.html similarity index 100% rename from packages/driver/test/cypress/fixtures/xhr-triggered.html rename to packages/driver/cypress/fixtures/xhr-triggered.html diff --git a/packages/driver/test/cypress/fixtures/xhr.html b/packages/driver/cypress/fixtures/xhr.html similarity index 100% rename from packages/driver/test/cypress/fixtures/xhr.html rename to packages/driver/cypress/fixtures/xhr.html diff --git a/packages/driver/test/cypress/fixtures/yaml.yaml b/packages/driver/cypress/fixtures/yaml.yaml similarity index 100% rename from packages/driver/test/cypress/fixtures/yaml.yaml rename to packages/driver/cypress/fixtures/yaml.yaml diff --git a/packages/driver/test/cypress/fixtures/zonejs.html b/packages/driver/cypress/fixtures/zonejs.html similarity index 100% rename from packages/driver/test/cypress/fixtures/zonejs.html rename to packages/driver/cypress/fixtures/zonejs.html diff --git a/packages/driver/test/cypress/integration/commands/actions/check_spec.js b/packages/driver/cypress/integration/commands/actions/check_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/check_spec.js rename to packages/driver/cypress/integration/commands/actions/check_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/clear_spec.js b/packages/driver/cypress/integration/commands/actions/clear_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/clear_spec.js rename to packages/driver/cypress/integration/commands/actions/clear_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/click_spec.js b/packages/driver/cypress/integration/commands/actions/click_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/click_spec.js rename to packages/driver/cypress/integration/commands/actions/click_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/focus_spec.js b/packages/driver/cypress/integration/commands/actions/focus_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/focus_spec.js rename to packages/driver/cypress/integration/commands/actions/focus_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/hover_spec.js b/packages/driver/cypress/integration/commands/actions/hover_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/hover_spec.js rename to packages/driver/cypress/integration/commands/actions/hover_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/scroll_spec.js b/packages/driver/cypress/integration/commands/actions/scroll_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/scroll_spec.js rename to packages/driver/cypress/integration/commands/actions/scroll_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/select_spec.js b/packages/driver/cypress/integration/commands/actions/select_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/select_spec.js rename to packages/driver/cypress/integration/commands/actions/select_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/submit_spec.js b/packages/driver/cypress/integration/commands/actions/submit_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/submit_spec.js rename to packages/driver/cypress/integration/commands/actions/submit_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/trigger_spec.js b/packages/driver/cypress/integration/commands/actions/trigger_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/trigger_spec.js rename to packages/driver/cypress/integration/commands/actions/trigger_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/type_errors_spec.js b/packages/driver/cypress/integration/commands/actions/type_errors_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/type_errors_spec.js rename to packages/driver/cypress/integration/commands/actions/type_errors_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/type_spec.js b/packages/driver/cypress/integration/commands/actions/type_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/type_spec.js rename to packages/driver/cypress/integration/commands/actions/type_spec.js diff --git a/packages/driver/test/cypress/integration/commands/actions/type_special_chars_spec.js b/packages/driver/cypress/integration/commands/actions/type_special_chars_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/actions/type_special_chars_spec.js rename to packages/driver/cypress/integration/commands/actions/type_special_chars_spec.js diff --git a/packages/driver/test/cypress/integration/commands/agents_spec.js b/packages/driver/cypress/integration/commands/agents_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/agents_spec.js rename to packages/driver/cypress/integration/commands/agents_spec.js diff --git a/packages/driver/test/cypress/integration/commands/aliasing_spec.js b/packages/driver/cypress/integration/commands/aliasing_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/aliasing_spec.js rename to packages/driver/cypress/integration/commands/aliasing_spec.js diff --git a/packages/driver/test/cypress/integration/commands/angular_spec.js b/packages/driver/cypress/integration/commands/angular_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/angular_spec.js rename to packages/driver/cypress/integration/commands/angular_spec.js diff --git a/packages/driver/test/cypress/integration/commands/assertions_spec.js b/packages/driver/cypress/integration/commands/assertions_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/assertions_spec.js rename to packages/driver/cypress/integration/commands/assertions_spec.js diff --git a/packages/driver/test/cypress/integration/commands/clock_spec.js b/packages/driver/cypress/integration/commands/clock_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/clock_spec.js rename to packages/driver/cypress/integration/commands/clock_spec.js diff --git a/packages/driver/test/cypress/integration/commands/command_option_immutability.js b/packages/driver/cypress/integration/commands/command_option_immutability.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/command_option_immutability.js rename to packages/driver/cypress/integration/commands/command_option_immutability.js diff --git a/packages/driver/test/cypress/integration/commands/commands_spec.js b/packages/driver/cypress/integration/commands/commands_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/commands_spec.js rename to packages/driver/cypress/integration/commands/commands_spec.js diff --git a/packages/driver/test/cypress/integration/commands/connectors_spec.js b/packages/driver/cypress/integration/commands/connectors_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/connectors_spec.js rename to packages/driver/cypress/integration/commands/connectors_spec.js diff --git a/packages/driver/test/cypress/integration/commands/cookies_spec.js b/packages/driver/cypress/integration/commands/cookies_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/cookies_spec.js rename to packages/driver/cypress/integration/commands/cookies_spec.js diff --git a/packages/driver/test/cypress/integration/commands/debugging_spec.js b/packages/driver/cypress/integration/commands/debugging_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/debugging_spec.js rename to packages/driver/cypress/integration/commands/debugging_spec.js diff --git a/packages/driver/test/cypress/integration/commands/exec_spec.js b/packages/driver/cypress/integration/commands/exec_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/exec_spec.js rename to packages/driver/cypress/integration/commands/exec_spec.js diff --git a/packages/driver/test/cypress/integration/commands/files_spec.js b/packages/driver/cypress/integration/commands/files_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/files_spec.js rename to packages/driver/cypress/integration/commands/files_spec.js diff --git a/packages/driver/test/cypress/integration/commands/fixtures_spec.js b/packages/driver/cypress/integration/commands/fixtures_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/fixtures_spec.js rename to packages/driver/cypress/integration/commands/fixtures_spec.js diff --git a/packages/driver/test/cypress/integration/commands/local_storage_spec.js b/packages/driver/cypress/integration/commands/local_storage_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/local_storage_spec.js rename to packages/driver/cypress/integration/commands/local_storage_spec.js diff --git a/packages/driver/test/cypress/integration/commands/location_spec.js b/packages/driver/cypress/integration/commands/location_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/location_spec.js rename to packages/driver/cypress/integration/commands/location_spec.js diff --git a/packages/driver/test/cypress/integration/commands/misc_spec.js b/packages/driver/cypress/integration/commands/misc_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/misc_spec.js rename to packages/driver/cypress/integration/commands/misc_spec.js diff --git a/packages/driver/test/cypress/integration/commands/navigation_spec.js b/packages/driver/cypress/integration/commands/navigation_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/navigation_spec.js rename to packages/driver/cypress/integration/commands/navigation_spec.js diff --git a/packages/driver/test/cypress/integration/commands/popups_spec.js b/packages/driver/cypress/integration/commands/popups_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/popups_spec.js rename to packages/driver/cypress/integration/commands/popups_spec.js diff --git a/packages/driver/test/cypress/integration/commands/querying_spec.js b/packages/driver/cypress/integration/commands/querying_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/querying_spec.js rename to packages/driver/cypress/integration/commands/querying_spec.js diff --git a/packages/driver/test/cypress/integration/commands/request_spec.js b/packages/driver/cypress/integration/commands/request_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/request_spec.js rename to packages/driver/cypress/integration/commands/request_spec.js diff --git a/packages/driver/test/cypress/integration/commands/screenshot_spec.js b/packages/driver/cypress/integration/commands/screenshot_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/screenshot_spec.js rename to packages/driver/cypress/integration/commands/screenshot_spec.js diff --git a/packages/driver/test/cypress/integration/commands/task_spec.js b/packages/driver/cypress/integration/commands/task_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/task_spec.js rename to packages/driver/cypress/integration/commands/task_spec.js diff --git a/packages/driver/test/cypress/integration/commands/traversals_spec.js b/packages/driver/cypress/integration/commands/traversals_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/traversals_spec.js rename to packages/driver/cypress/integration/commands/traversals_spec.js diff --git a/packages/driver/test/cypress/integration/commands/waiting_spec.js b/packages/driver/cypress/integration/commands/waiting_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/waiting_spec.js rename to packages/driver/cypress/integration/commands/waiting_spec.js diff --git a/packages/driver/test/cypress/integration/commands/window_spec.js b/packages/driver/cypress/integration/commands/window_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/commands/window_spec.js rename to packages/driver/cypress/integration/commands/window_spec.js diff --git a/packages/driver/test/cypress/integration/commands/xhr_spec.js b/packages/driver/cypress/integration/commands/xhr_spec.js similarity index 99% rename from packages/driver/test/cypress/integration/commands/xhr_spec.js rename to packages/driver/cypress/integration/commands/xhr_spec.js index 47593ed4ee57..b720bebad347 100644 --- a/packages/driver/test/cypress/integration/commands/xhr_spec.js +++ b/packages/driver/cypress/integration/commands/xhr_spec.js @@ -739,17 +739,19 @@ describe('src/cy/commands/xhr', () => { it('handles arraybuffer', () => { cy .server() - .route('GET', /buffer/).as('getBuffer') + .route('GET', /arraybuffer/).as('getBuffer') .window().then((win) => { const xhr = new win.XMLHttpRequest xhr.responseType = 'arraybuffer' - xhr.open('GET', '/buffer') + xhr.open('GET', '/arraybuffer') xhr.send() return null }) .wait('@getBuffer').then((xhr) => { + expect(xhr.status).eq(200) + expect(xhr.responseBody.byteLength).gt(0) expect(xhr.responseBody.toString()).to.eq('[object ArrayBuffer]') }) }) diff --git a/packages/driver/test/cypress/integration/cy/snapshot_css_spec.js b/packages/driver/cypress/integration/cy/snapshot_css_spec.js similarity index 99% rename from packages/driver/test/cypress/integration/cy/snapshot_css_spec.js rename to packages/driver/cypress/integration/cy/snapshot_css_spec.js index 9b61bcbd2430..491a7142f811 100644 --- a/packages/driver/test/cypress/integration/cy/snapshot_css_spec.js +++ b/packages/driver/cypress/integration/cy/snapshot_css_spec.js @@ -1,5 +1,5 @@ const { $ } = Cypress -const $SnapshotsCss = require('../../../../src/cy/snapshots_css') +const $SnapshotsCss = require('../../../src/cy/snapshots_css') const normalizeStyles = (styles) => { return styles diff --git a/packages/driver/test/cypress/integration/cy/snapshot_spec.js b/packages/driver/cypress/integration/cy/snapshot_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cy/snapshot_spec.js rename to packages/driver/cypress/integration/cy/snapshot_spec.js diff --git a/packages/driver/test/cypress/integration/cy/timeouts_spec.js b/packages/driver/cypress/integration/cy/timeouts_spec.js similarity index 95% rename from packages/driver/test/cypress/integration/cy/timeouts_spec.js rename to packages/driver/cypress/integration/cy/timeouts_spec.js index 9ddb626c71f3..e1636f87efbc 100644 --- a/packages/driver/test/cypress/integration/cy/timeouts_spec.js +++ b/packages/driver/cypress/integration/cy/timeouts_spec.js @@ -1,4 +1,4 @@ -import Timeouts from '../../../../src/cy/timeouts' +import Timeouts from '@packages/driver/src/cy/timeouts' describe('driver/src/cy/timeouts', () => { beforeEach(() => { diff --git a/packages/driver/test/cypress/integration/cy/timers_spec.js b/packages/driver/cypress/integration/cy/timers_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cy/timers_spec.js rename to packages/driver/cypress/integration/cy/timers_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/browser_spec.js b/packages/driver/cypress/integration/cypress/browser_spec.js similarity index 97% rename from packages/driver/test/cypress/integration/cypress/browser_spec.js rename to packages/driver/cypress/integration/cypress/browser_spec.js index f923994b3c4f..86632b862c96 100644 --- a/packages/driver/test/cypress/integration/cypress/browser_spec.js +++ b/packages/driver/cypress/integration/cypress/browser_spec.js @@ -1,4 +1,4 @@ -const browserProps = require('../../../../src/cypress/browser') +const browserProps = require('@packages/driver/src/cypress/browser') describe('src/cypress/browser', () => { beforeEach(function () { diff --git a/packages/driver/test/cypress/integration/cypress/cy_spec.js b/packages/driver/cypress/integration/cypress/cy_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cypress/cy_spec.js rename to packages/driver/cypress/integration/cypress/cy_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/cypress_spec.js b/packages/driver/cypress/integration/cypress/cypress_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cypress/cypress_spec.js rename to packages/driver/cypress/integration/cypress/cypress_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/error_utils_spec.js b/packages/driver/cypress/integration/cypress/error_utils_spec.js similarity index 98% rename from packages/driver/test/cypress/integration/cypress/error_utils_spec.js rename to packages/driver/cypress/integration/cypress/error_utils_spec.js index 66f5d9c4951f..c8cc4740cd5d 100644 --- a/packages/driver/test/cypress/integration/cypress/error_utils_spec.js +++ b/packages/driver/cypress/integration/cypress/error_utils_spec.js @@ -1,6 +1,6 @@ -const $errUtils = require('../../../../src/cypress/error_utils') -const $stackUtils = require('../../../../src/cypress/stack_utils') -const $errorMessages = require('../../../../src/cypress/error_messages') +const $errUtils = require('@packages/driver/src/cypress/error_utils') +const $stackUtils = require('@packages/driver/src/cypress/stack_utils') +const $errorMessages = require('@packages/driver/src/cypress/error_messages') describe('driver/src/cypress/error_utils', () => { context('.modifyErrMsg', () => { diff --git a/packages/driver/test/cypress/integration/cypress/location_spec.js b/packages/driver/cypress/integration/cypress/location_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cypress/location_spec.js rename to packages/driver/cypress/integration/cypress/location_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/log_spec.js b/packages/driver/cypress/integration/cypress/log_spec.js similarity index 95% rename from packages/driver/test/cypress/integration/cypress/log_spec.js rename to packages/driver/cypress/integration/cypress/log_spec.js index 9a437124b65e..132f528c1c11 100644 --- a/packages/driver/test/cypress/integration/cypress/log_spec.js +++ b/packages/driver/cypress/integration/cypress/log_spec.js @@ -1,4 +1,4 @@ -const $Log = require('../../../../src/cypress/log') +const $Log = require('@packages/driver/src/cypress/log') describe('src/cypress/log', function () { context('#snapshot', function () { diff --git a/packages/driver/test/cypress/integration/cypress/network_utils_spec.js b/packages/driver/cypress/integration/cypress/network_utils_spec.js similarity index 94% rename from packages/driver/test/cypress/integration/cypress/network_utils_spec.js rename to packages/driver/cypress/integration/cypress/network_utils_spec.js index 8dd3a182c522..99e33d0b3eaf 100644 --- a/packages/driver/test/cypress/integration/cypress/network_utils_spec.js +++ b/packages/driver/cypress/integration/cypress/network_utils_spec.js @@ -1,4 +1,4 @@ -const $networkUtils = require('../../../../src/cypress/network_utils') +const $networkUtils = require('@packages/driver/src/cypress/network_utils') describe('src/cypress/network_utils', () => { context('#fetch', () => { diff --git a/packages/driver/test/cypress/integration/cypress/resolvers_spec.ts b/packages/driver/cypress/integration/cypress/resolvers_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/cypress/resolvers_spec.ts rename to packages/driver/cypress/integration/cypress/resolvers_spec.ts diff --git a/packages/driver/test/cypress/integration/cypress/runner_spec.js b/packages/driver/cypress/integration/cypress/runner_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cypress/runner_spec.js rename to packages/driver/cypress/integration/cypress/runner_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/screenshot_spec.js b/packages/driver/cypress/integration/cypress/screenshot_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cypress/screenshot_spec.js rename to packages/driver/cypress/integration/cypress/screenshot_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/script_utils_spec.js b/packages/driver/cypress/integration/cypress/script_utils_spec.js similarity index 88% rename from packages/driver/test/cypress/integration/cypress/script_utils_spec.js rename to packages/driver/cypress/integration/cypress/script_utils_spec.js index 5ab7585f1202..ac58e2e051ad 100644 --- a/packages/driver/test/cypress/integration/cypress/script_utils_spec.js +++ b/packages/driver/cypress/integration/cypress/script_utils_spec.js @@ -1,6 +1,6 @@ -const $scriptUtils = require('../../../../src/cypress/script_utils') -const $networkUtils = require('../../../../src/cypress/network_utils') -const $sourceMapUtils = require('../../../../src/cypress/source_map_utils') +const $scriptUtils = require('@packages/driver/src/cypress/script_utils') +const $networkUtils = require('@packages/driver/src/cypress/network_utils') +const $sourceMapUtils = require('@packages/driver/src/cypress/source_map_utils') describe('src/cypress/script_utils', () => { context('#runScripts', () => { diff --git a/packages/driver/test/cypress/integration/cypress/selector_playground_spec.js b/packages/driver/cypress/integration/cypress/selector_playground_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/cypress/selector_playground_spec.js rename to packages/driver/cypress/integration/cypress/selector_playground_spec.js diff --git a/packages/driver/test/cypress/integration/cypress/source_map_utils_spec.js b/packages/driver/cypress/integration/cypress/source_map_utils_spec.js similarity index 98% rename from packages/driver/test/cypress/integration/cypress/source_map_utils_spec.js rename to packages/driver/cypress/integration/cypress/source_map_utils_spec.js index 87d6df0a8c8f..d451cfaa866c 100644 --- a/packages/driver/test/cypress/integration/cypress/source_map_utils_spec.js +++ b/packages/driver/cypress/integration/cypress/source_map_utils_spec.js @@ -4,7 +4,7 @@ import { getSourceContents, getSourcePosition, initializeSourceMapConsumer, -} from '../../../../src/cypress/source_map_utils' +} from '@packages/driver/src/cypress/source_map_utils' const _ = Cypress._ const { encodeBase64Unicode } = Cypress.utils diff --git a/packages/driver/test/cypress/integration/cypress/stack_utils_spec.js b/packages/driver/cypress/integration/cypress/stack_utils_spec.js similarity index 98% rename from packages/driver/test/cypress/integration/cypress/stack_utils_spec.js rename to packages/driver/cypress/integration/cypress/stack_utils_spec.js index 590cd514d2b7..8b4638b26f86 100644 --- a/packages/driver/test/cypress/integration/cypress/stack_utils_spec.js +++ b/packages/driver/cypress/integration/cypress/stack_utils_spec.js @@ -1,5 +1,5 @@ -const $stackUtils = require('../../../../src/cypress/stack_utils') -const $sourceMapUtils = require('../../../../src/cypress/source_map_utils') +const $stackUtils = require('@packages/driver/src/cypress/stack_utils') +const $sourceMapUtils = require('@packages/driver/src/cypress/source_map_utils') describe('driver/src/cypress/stack_utils', () => { context('.replacedStack', () => { diff --git a/packages/driver/test/cypress/integration/cypress/utils_spec.js b/packages/driver/cypress/integration/cypress/utils_spec.js similarity index 98% rename from packages/driver/test/cypress/integration/cypress/utils_spec.js rename to packages/driver/cypress/integration/cypress/utils_spec.js index 214cdc0c98a2..d2e5bb59180c 100644 --- a/packages/driver/test/cypress/integration/cypress/utils_spec.js +++ b/packages/driver/cypress/integration/cypress/utils_spec.js @@ -1,4 +1,4 @@ -const LimitedMap = require('../../../../src/util/limited_map') +const LimitedMap = require('@packages/driver/src/util/limited_map') const $utils = Cypress.utils describe('driver/src/cypress/utils', () => { diff --git a/packages/driver/test/cypress/integration/cypress/xml_http_request_spec.js b/packages/driver/cypress/integration/cypress/xml_http_request_spec.js similarity index 92% rename from packages/driver/test/cypress/integration/cypress/xml_http_request_spec.js rename to packages/driver/cypress/integration/cypress/xml_http_request_spec.js index 493a40f6783d..468c7ebc9fdd 100644 --- a/packages/driver/test/cypress/integration/cypress/xml_http_request_spec.js +++ b/packages/driver/cypress/integration/cypress/xml_http_request_spec.js @@ -1,4 +1,4 @@ -import $XHR from '../../../../src/cypress/xml_http_request' +import $XHR from '@packages/driver/src/cypress/xml_http_request' describe('src/cypress/xml_http_request', () => { let xhr diff --git a/packages/driver/test/cypress/integration/dom/coordinates_spec.ts b/packages/driver/cypress/integration/dom/coordinates_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/dom/coordinates_spec.ts rename to packages/driver/cypress/integration/dom/coordinates_spec.ts diff --git a/packages/driver/test/cypress/integration/dom/elements_spec.ts b/packages/driver/cypress/integration/dom/elements_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/dom/elements_spec.ts rename to packages/driver/cypress/integration/dom/elements_spec.ts diff --git a/packages/driver/test/cypress/integration/dom/jquery_spec.ts b/packages/driver/cypress/integration/dom/jquery_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/dom/jquery_spec.ts rename to packages/driver/cypress/integration/dom/jquery_spec.ts diff --git a/packages/driver/test/cypress/integration/dom/visibility_spec.ts b/packages/driver/cypress/integration/dom/visibility_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/dom/visibility_spec.ts rename to packages/driver/cypress/integration/dom/visibility_spec.ts diff --git a/packages/driver/test/cypress/integration/e2e/abort_beforeunload_event_child_spec.ts b/packages/driver/cypress/integration/e2e/abort_beforeunload_event_child_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/e2e/abort_beforeunload_event_child_spec.ts rename to packages/driver/cypress/integration/e2e/abort_beforeunload_event_child_spec.ts diff --git a/packages/driver/test/cypress/integration/e2e/abort_beforeunload_event_spec.ts b/packages/driver/cypress/integration/e2e/abort_beforeunload_event_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/e2e/abort_beforeunload_event_spec.ts rename to packages/driver/cypress/integration/e2e/abort_beforeunload_event_spec.ts diff --git a/packages/driver/test/cypress/integration/e2e/abort_onbeforeunload_child_spec.ts b/packages/driver/cypress/integration/e2e/abort_onbeforeunload_child_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/e2e/abort_onbeforeunload_child_spec.ts rename to packages/driver/cypress/integration/e2e/abort_onbeforeunload_child_spec.ts diff --git a/packages/driver/test/cypress/integration/e2e/abort_onbeforeunload_spec.ts b/packages/driver/cypress/integration/e2e/abort_onbeforeunload_spec.ts similarity index 100% rename from packages/driver/test/cypress/integration/e2e/abort_onbeforeunload_spec.ts rename to packages/driver/cypress/integration/e2e/abort_onbeforeunload_spec.ts diff --git a/packages/driver/test/cypress/integration/e2e/cancelation_spec.js b/packages/driver/cypress/integration/e2e/cancelation_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/cancelation_spec.js rename to packages/driver/cypress/integration/e2e/cancelation_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/dom_hitbox.spec.js b/packages/driver/cypress/integration/e2e/dom_hitbox.spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/dom_hitbox.spec.js rename to packages/driver/cypress/integration/e2e/dom_hitbox.spec.js diff --git a/packages/driver/test/cypress/integration/e2e/ended_early_spec.js b/packages/driver/cypress/integration/e2e/ended_early_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/ended_early_spec.js rename to packages/driver/cypress/integration/e2e/ended_early_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/focus_blur_spec.js b/packages/driver/cypress/integration/e2e/focus_blur_spec.js similarity index 99% rename from packages/driver/test/cypress/integration/e2e/focus_blur_spec.js rename to packages/driver/cypress/integration/e2e/focus_blur_spec.js index 9a2c739addf3..fa94533f9f1a 100644 --- a/packages/driver/test/cypress/integration/e2e/focus_blur_spec.js +++ b/packages/driver/cypress/integration/e2e/focus_blur_spec.js @@ -1,4 +1,3 @@ -/// /* eslint arrow-body-style:'off' */ /** diff --git a/packages/driver/test/cypress/integration/e2e/keyboard_spec.js b/packages/driver/cypress/integration/e2e/keyboard_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/keyboard_spec.js rename to packages/driver/cypress/integration/e2e/keyboard_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/promises_spec.js b/packages/driver/cypress/integration/e2e/promises_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/promises_spec.js rename to packages/driver/cypress/integration/e2e/promises_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/react-15_spec.js b/packages/driver/cypress/integration/e2e/react-15_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/react-15_spec.js rename to packages/driver/cypress/integration/e2e/react-15_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/react-16_spec.js b/packages/driver/cypress/integration/e2e/react-16_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/react-16_spec.js rename to packages/driver/cypress/integration/e2e/react-16_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/redirects_spec.js b/packages/driver/cypress/integration/e2e/redirects_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/redirects_spec.js rename to packages/driver/cypress/integration/e2e/redirects_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/rerun_spec.js b/packages/driver/cypress/integration/e2e/rerun_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/rerun_spec.js rename to packages/driver/cypress/integration/e2e/rerun_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/return_value_spec.js b/packages/driver/cypress/integration/e2e/return_value_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/return_value_spec.js rename to packages/driver/cypress/integration/e2e/return_value_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/security_spec.js b/packages/driver/cypress/integration/e2e/security_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/security_spec.js rename to packages/driver/cypress/integration/e2e/security_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/selector_playground.spec.js b/packages/driver/cypress/integration/e2e/selector_playground.spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/selector_playground.spec.js rename to packages/driver/cypress/integration/e2e/selector_playground.spec.js diff --git a/packages/driver/test/cypress/integration/e2e/testConfigOverrides.spec.js b/packages/driver/cypress/integration/e2e/testConfigOverrides.spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/testConfigOverrides.spec.js rename to packages/driver/cypress/integration/e2e/testConfigOverrides.spec.js diff --git a/packages/driver/test/cypress/integration/e2e/text_mask_spec.js b/packages/driver/cypress/integration/e2e/text_mask_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/text_mask_spec.js rename to packages/driver/cypress/integration/e2e/text_mask_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/uncaught_errors_spec.js b/packages/driver/cypress/integration/e2e/uncaught_errors_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/uncaught_errors_spec.js rename to packages/driver/cypress/integration/e2e/uncaught_errors_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/video_spec.js b/packages/driver/cypress/integration/e2e/video_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/video_spec.js rename to packages/driver/cypress/integration/e2e/video_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/visibility_spec.js b/packages/driver/cypress/integration/e2e/visibility_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/visibility_spec.js rename to packages/driver/cypress/integration/e2e/visibility_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/webcam_spec.js b/packages/driver/cypress/integration/e2e/webcam_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/webcam_spec.js rename to packages/driver/cypress/integration/e2e/webcam_spec.js diff --git a/packages/driver/test/cypress/integration/e2e/zonejs_spec.js b/packages/driver/cypress/integration/e2e/zonejs_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/e2e/zonejs_spec.js rename to packages/driver/cypress/integration/e2e/zonejs_spec.js diff --git a/packages/driver/test/cypress/integration/issues/1436_spec.js b/packages/driver/cypress/integration/issues/1436_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/1436_spec.js rename to packages/driver/cypress/integration/issues/1436_spec.js diff --git a/packages/driver/test/cypress/integration/issues/1854_spec.js b/packages/driver/cypress/integration/issues/1854_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/1854_spec.js rename to packages/driver/cypress/integration/issues/1854_spec.js diff --git a/packages/driver/test/cypress/integration/issues/1909_spec.js b/packages/driver/cypress/integration/issues/1909_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/1909_spec.js rename to packages/driver/cypress/integration/issues/1909_spec.js diff --git a/packages/driver/test/cypress/integration/issues/1939_1940_2190_spec.js b/packages/driver/cypress/integration/issues/1939_1940_2190_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/1939_1940_2190_spec.js rename to packages/driver/cypress/integration/issues/1939_1940_2190_spec.js diff --git a/packages/driver/test/cypress/integration/issues/2582_spec.js b/packages/driver/cypress/integration/issues/2582_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/2582_spec.js rename to packages/driver/cypress/integration/issues/2582_spec.js diff --git a/packages/driver/test/cypress/integration/issues/2784_spec.js b/packages/driver/cypress/integration/issues/2784_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/2784_spec.js rename to packages/driver/cypress/integration/issues/2784_spec.js diff --git a/packages/driver/test/cypress/integration/issues/2850_spec.js b/packages/driver/cypress/integration/issues/2850_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/2850_spec.js rename to packages/driver/cypress/integration/issues/2850_spec.js diff --git a/packages/driver/test/cypress/integration/issues/3253_spec.js b/packages/driver/cypress/integration/issues/3253_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/3253_spec.js rename to packages/driver/cypress/integration/issues/3253_spec.js diff --git a/packages/driver/test/cypress/integration/issues/3847_spec.js b/packages/driver/cypress/integration/issues/3847_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/3847_spec.js rename to packages/driver/cypress/integration/issues/3847_spec.js diff --git a/packages/driver/test/cypress/integration/issues/4373_spec.js b/packages/driver/cypress/integration/issues/4373_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/4373_spec.js rename to packages/driver/cypress/integration/issues/4373_spec.js diff --git a/packages/driver/test/cypress/integration/issues/510_spec.js b/packages/driver/cypress/integration/issues/510_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/510_spec.js rename to packages/driver/cypress/integration/issues/510_spec.js diff --git a/packages/driver/test/cypress/integration/issues/565_spec.js b/packages/driver/cypress/integration/issues/565_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/565_spec.js rename to packages/driver/cypress/integration/issues/565_spec.js diff --git a/packages/driver/test/cypress/integration/issues/5682_spec.js b/packages/driver/cypress/integration/issues/5682_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/5682_spec.js rename to packages/driver/cypress/integration/issues/5682_spec.js diff --git a/packages/driver/test/cypress/integration/issues/5707_spec.js b/packages/driver/cypress/integration/issues/5707_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/5707_spec.js rename to packages/driver/cypress/integration/issues/5707_spec.js diff --git a/packages/driver/test/cypress/integration/issues/573_spec.js b/packages/driver/cypress/integration/issues/573_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/573_spec.js rename to packages/driver/cypress/integration/issues/573_spec.js diff --git a/packages/driver/test/cypress/integration/issues/599_spec.js b/packages/driver/cypress/integration/issues/599_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/599_spec.js rename to packages/driver/cypress/integration/issues/599_spec.js diff --git a/packages/driver/test/cypress/integration/issues/652_spec.js b/packages/driver/cypress/integration/issues/652_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/652_spec.js rename to packages/driver/cypress/integration/issues/652_spec.js diff --git a/packages/driver/test/cypress/integration/issues/761_2968_3973_spec.js b/packages/driver/cypress/integration/issues/761_2968_3973_spec.js similarity index 100% rename from packages/driver/test/cypress/integration/issues/761_2968_3973_spec.js rename to packages/driver/cypress/integration/issues/761_2968_3973_spec.js diff --git a/packages/driver/test/cypress/integration/util/firefox_forced_gc_spec.ts b/packages/driver/cypress/integration/util/firefox_forced_gc_spec.ts similarity index 98% rename from packages/driver/test/cypress/integration/util/firefox_forced_gc_spec.ts rename to packages/driver/cypress/integration/util/firefox_forced_gc_spec.ts index 999fe12b0ee3..a6872bf12dcf 100644 --- a/packages/driver/test/cypress/integration/util/firefox_forced_gc_spec.ts +++ b/packages/driver/cypress/integration/util/firefox_forced_gc_spec.ts @@ -1,4 +1,4 @@ -import { createIntervalGetter, install } from '../../../../src/util/firefox_forced_gc' +import { createIntervalGetter, install } from '../../../src/util/firefox_forced_gc' describe('driver/src/util/firefox_forced_gc', () => { describe('#createIntervalGetter returns a function that', () => { diff --git a/packages/driver/test/cypress/integration/util/limited_map_spec.js b/packages/driver/cypress/integration/util/limited_map_spec.js similarity index 96% rename from packages/driver/test/cypress/integration/util/limited_map_spec.js rename to packages/driver/cypress/integration/util/limited_map_spec.js index 65606df92240..85adb84a627b 100644 --- a/packages/driver/test/cypress/integration/util/limited_map_spec.js +++ b/packages/driver/cypress/integration/util/limited_map_spec.js @@ -1,4 +1,4 @@ -const LimitedMap = require('../../../../src/util/limited_map') +const LimitedMap = require('@packages/driver/src/util/limited_map') const _ = Cypress._ diff --git a/packages/driver/test/cypress/plugins/index.js b/packages/driver/cypress/plugins/index.js similarity index 98% rename from packages/driver/test/cypress/plugins/index.js rename to packages/driver/cypress/plugins/index.js index 046ea2613c35..90a80591f241 100644 --- a/packages/driver/test/cypress/plugins/index.js +++ b/packages/driver/cypress/plugins/index.js @@ -1,6 +1,6 @@ // only required to read in webpack config, since it is .ts require('@packages/ts/register') - +require('./server') const _ = require('lodash') const path = require('path') const fs = require('fs-extra') diff --git a/packages/driver/test/support/server.js b/packages/driver/cypress/plugins/server.js similarity index 89% rename from packages/driver/test/support/server.js rename to packages/driver/cypress/plugins/server.js index 7475f767fd41..7c0bbfddbaad 100644 --- a/packages/driver/test/support/server.js +++ b/packages/driver/cypress/plugins/server.js @@ -6,6 +6,7 @@ const http = require('http') const path = require('path') const Promise = require('bluebird') +const PATH_TO_SERVER_PKG = path.dirname(require.resolve('@packages/server')) const ports = [3500, 3501] ports.forEach((port) => { @@ -16,8 +17,6 @@ ports.forEach((port) => { app.set('view engine', 'html') - app.use(require('morgan')({ format: 'dev' })) - app.use(require('cors')()) app.use(require('compression')()) app.use(bodyParser.urlencoded({ extended: false })) @@ -46,8 +45,12 @@ ports.forEach((port) => { return res.type('xml').send('bar') }) - app.get('/buffer', (req, res) => { - return fs.readFile(path.join(__dirname, '../cypress/fixtures/sample.pdf'), (err, bytes) => { + app.get('/arraybuffer', (req, res) => { + return fs.readFile(path.join(PATH_TO_SERVER_PKG, 'test/support/fixtures/sample.pdf'), (err, bytes) => { + if (err) { + return res.status(500).send(err.stack) + } + res.type('pdf') return res.send(bytes) @@ -108,7 +111,7 @@ ports.forEach((port) => { .send('server error') }) - app.use(express.static(path.join(__dirname, '..', 'cypress'))) + app.use(express.static(path.join(__dirname, '..'))) app.use(require('errorhandler')()) diff --git a/packages/driver/test/cypress/support/defaults.js b/packages/driver/cypress/support/defaults.js similarity index 100% rename from packages/driver/test/cypress/support/defaults.js rename to packages/driver/cypress/support/defaults.js diff --git a/packages/driver/test/cypress/support/helpers.js b/packages/driver/cypress/support/helpers.js similarity index 100% rename from packages/driver/test/cypress/support/helpers.js rename to packages/driver/cypress/support/helpers.js diff --git a/packages/driver/test/cypress/support/index.js b/packages/driver/cypress/support/index.js similarity index 100% rename from packages/driver/test/cypress/support/index.js rename to packages/driver/cypress/support/index.js diff --git a/packages/driver/test/cypress/support/utils.js b/packages/driver/cypress/support/utils.js similarity index 100% rename from packages/driver/test/cypress/support/utils.js rename to packages/driver/cypress/support/utils.js diff --git a/packages/driver/index.d.ts b/packages/driver/index.d.ts index 5557a6c2ad35..b814a4d928e4 100644 --- a/packages/driver/index.d.ts +++ b/packages/driver/index.d.ts @@ -1,4 +1,4 @@ -/// +/// /// export const $Cypress: Cypress.Cypress diff --git a/packages/driver/package.json b/packages/driver/package.json index 291a9647eeac..f2a8010b99bc 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -4,10 +4,10 @@ "private": true, "scripts": { "clean-deps": "rm -rf node_modules", - "cypress:open": "node ../../scripts/cypress open --project ./test", - "cypress:run": "node ../../scripts/cypress run --project ./test", + "cypress:open": "node ../../scripts/cypress open", + "cypress:run": "node ../../scripts/cypress run", "postinstall": "patch-package", - "start": "node test/support/server.js" + "start": "node -e 'console.log(require(`chalk`).red(`\nError:\n\tRunning \\`yarn start\\` is no longer needed for driver/cypress tests.\n\tWe now automatically spawn the server in the pluginsFile.\n\tChanges to the server will be watched and reloaded automatically.`))'" }, "dependencies": {}, "devDependencies": { diff --git a/packages/driver/src/config/lodash.d.ts b/packages/driver/src/config/lodash.d.ts deleted file mode 100644 index 636b03e4e7b3..000000000000 --- a/packages/driver/src/config/lodash.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -// const _ = require('lodash') -import _ from 'lodash' - -import clean from 'underscore.string/clean' -import count from 'underscore.string/count' -import isBlank from 'underscore.string/isBlank' -import toBoolean from 'underscore.string/toBoolean' - -// only export exactly what we need, nothing more! -_.mixin({ - clean, - count, - isBlank, - toBoolean, -}) - -declare module 'lodash' { - export interface LoDashExplicitWrapper { - clean(...args): LoDashExplicitWrapper - count(...args): LoDashExplicitWrapper - isBlank(...args): LoDashExplicitWrapper - toBoolean(...args): LoDashExplicitWrapper - } - - export interface LodashStatic { - clean(...args): LoDashExplicitWrapper - count(...args): LoDashExplicitWrapper - isBlank(...args): LoDashExplicitWrapper - toBoolean(...args): LoDashExplicitWrapper - } -} - -export default _ diff --git a/packages/driver/src/cy/chai.js b/packages/driver/src/cy/chai.js index b78ed33faba1..c1394dd0d95a 100644 --- a/packages/driver/src/cy/chai.js +++ b/packages/driver/src/cy/chai.js @@ -1,5 +1,5 @@ /* eslint-disable prefer-rest-params */ -// tests in driver/test/cypress/integration/commands/assertions_spec.js +// tests in driver/cypress/integration/commands/assertions_spec.js const _ = require('lodash') const $ = require('jquery') diff --git a/packages/driver/test/cypress/.eslintrc.json b/packages/driver/test/cypress/.eslintrc.json deleted file mode 100644 index 5b988562725d..000000000000 --- a/packages/driver/test/cypress/.eslintrc.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "plugins": [ - "cypress" - ], - "env": { - "cypress/globals": true - } -} diff --git a/packages/driver/test/support/unit_spec_helper.js b/packages/driver/test/support/unit_spec_helper.js deleted file mode 100644 index a99fc20d30eb..000000000000 --- a/packages/driver/test/support/unit_spec_helper.js +++ /dev/null @@ -1,25 +0,0 @@ -const path = require('path') -const chai = require('chai') -const jsdom = require('jsdom').JSDOM -const sinon = require('sinon') -const sinonChai = require('@cypress/sinon-chai') - -chai -.use(sinonChai) - -// src = /Users/foo/cypress/packages/driver/src -global.src = path.resolve('src') -global.expect = chai.expect - -// create jsdom and setup browser globals -global.jsdom = new jsdom('') -global.window = global.jsdom.windows -global.document = window.document - -beforeEach(function () { - this.sandbox = sinon.createSandbox() -}) - -afterEach(function () { - this.sandbox.restore() -}) diff --git a/packages/driver/test/support/watch b/packages/driver/test/support/watch deleted file mode 100755 index 9af43a4d957b..000000000000 --- a/packages/driver/test/support/watch +++ /dev/null @@ -1,3 +0,0 @@ -npm run test-unit --silent & \ -chokidar 'test/**/*' 'src/**/*' \ --c "npm run test-unit --silent" diff --git a/packages/driver/tsconfig.json b/packages/driver/tsconfig.json index 9255340ab9d0..c7029cdbbe91 100644 --- a/packages/driver/tsconfig.json +++ b/packages/driver/tsconfig.json @@ -18,6 +18,10 @@ "allowSyntheticDefaultImports": true, "outDir": "dist", "esModuleInterop": true, - "noErrorTruncation": true - } + "noErrorTruncation": true, + "types": [] + }, + "exclude": [ + "dist" + ] } diff --git a/packages/driver/ts/internal-types.d.ts b/packages/driver/types/internal-types.d.ts similarity index 100% rename from packages/driver/ts/internal-types.d.ts rename to packages/driver/types/internal-types.d.ts diff --git a/packages/runner/jsconfig.json b/packages/runner/jsconfig.json deleted file mode 100644 index 504cd646e149..000000000000 --- a/packages/runner/jsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "compilerOptions": { - "experimentalDecorators": true - } -} diff --git a/packages/runner/tsconfig.json b/packages/runner/tsconfig.json index 0cee70cbaa64..0a551ff94e62 100644 --- a/packages/runner/tsconfig.json +++ b/packages/runner/tsconfig.json @@ -46,7 +46,7 @@ // "baseUrl": "../", /* Base directory to resolve non-absolute module names. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": ["../driver/src"], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "types": [], /* Type declaration files to be included in compilation. */ + "types": [], /* Type declaration files to be included in compilation. */ "allowSyntheticDefaultImports": true, "esModuleInterop": true, "noErrorTruncation": true, @@ -54,6 +54,7 @@ // "noResolve": true }, "exclude": [ - "dist" + "dist", + "test" ] } diff --git a/packages/server/test/e2e/8_error_ui_spec.ts b/packages/server/test/e2e/8_error_ui_spec.ts index 37ba21a227ca..43ac85af8da3 100644 --- a/packages/server/test/e2e/8_error_ui_spec.ts +++ b/packages/server/test/e2e/8_error_ui_spec.ts @@ -34,7 +34,7 @@ describe('e2e error ui', function () { e2e.it('displays correct UI for errors', { spec: 'various_failures_spec.js', expectedExitCode: VARIOUS_FAILURES_EXPECTED_FAILURES, - timeout: 180000, // 3 minutes + timeout: 240000, // 4 minutes noTypeScript: true, onRun (exec) { return exec().then(verifyPassedAndFailedAreSame(VARIOUS_FAILURES_EXPECTED_FAILURES)) @@ -44,7 +44,7 @@ describe('e2e error ui', function () { e2e.it('displays correct UI for errors in custom commands', { spec: 'various_failures_custom_commands_spec.js', expectedExitCode: VARIOUS_FAILURES_EXPECTED_FAILURES, - timeout: 180000, // 3 minutes + timeout: 240000, // 4 minutes noTypeScript: true, onRun (exec) { return exec().then(verifyPassedAndFailedAreSame(VARIOUS_FAILURES_EXPECTED_FAILURES))