Merge branch 'chore-move-driver-tests-into-parent' into isolated-runn…

…er-fixes
cypress-io · Jun 11, 2020 · 5597ec4 · 5597ec4
2 parents f5bc2ed + e3257bf
commit 5597ec4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 46 deletions.
diff --git a/packages/driver/cypress/integration/e2e/focus_blur_spec.js b/packages/driver/cypress/integration/e2e/focus_blur_spec.js
@@ -1,4 +1,3 @@
-/// <reference path="../../../../../cli/types/index.d.ts" />
 /* eslint arrow-body-style:'off' */
 
 /**

diff --git a/packages/driver/index.d.ts b/packages/driver/index.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../cli/types/cypress.d.ts" />
+/// <reference path="../../cli/types/index.d.ts" />
 /// <reference path="../ts/index.d.ts" />
 export const $Cypress: Cypress.Cypress
 

diff --git a/packages/driver/src/config/lodash.d.ts b/packages/driver/src/config/lodash.d.ts
diff --git 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 → packages/driver/types/internal-types.d.ts b/packages/driver/ts/internal-types.d.ts → packages/driver/types/internal-types.d.ts
diff --git a/packages/runner/jsconfig.json b/packages/runner/jsconfig.json
diff --git a/packages/runner/tsconfig.json b/packages/runner/tsconfig.json
@@ -46,14 +46,15 @@
     // "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,
     "experimentalDecorators": true
     // "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
@@ -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))