User test runner improvements

Author: jablko

.gitignore

@@ -72,7 +72,6 @@ internal/
 yarn.lock
 yarn-error.log
 .parallelperf.*
-tests/cases/user/*/package-lock.json
 tests/cases/user/*/node_modules/
 tests/cases/user/*/**/*.js
 tests/cases/user/*/**/*.js.map

src/testRunner/externalCompileRunner.ts

@@ -55,18 +55,20 @@ abstract class ExternalCompileRunnerBase extends RunnerBase {
                     ts.Debug.assert(!!config.cloneUrl, "Bad format from test.json: cloneUrl field must be present.");
                     const submoduleDir = path.join(cwd, directoryName);
                     if (!fs.existsSync(submoduleDir)) {
-                        exec("git", ["clone", config.cloneUrl, directoryName], { cwd });
+                        exec("git", ["--work-tree", submoduleDir, "clone", config.cloneUrl, path.join(submoduleDir, ".git")], { cwd });
+                    }
+                    else {
+                        exec("git", ["--git-dir", path.join(submoduleDir, ".git"), "--work-tree", submoduleDir, "checkout", ":/"], { cwd: submoduleDir });
+                        exec("git", ["--git-dir", path.join(submoduleDir, ".git"), "--work-tree", submoduleDir, "clean", "-f"], { cwd: submoduleDir });
+                        exec("git", ["--git-dir", path.join(submoduleDir, ".git"), "--work-tree", submoduleDir, "pull", "-f"], { cwd: submoduleDir });
                     }
-                    exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir });
-                    exec("git", ["clean", "-f"], { cwd: submoduleDir });
-                    exec("git", ["pull", "-f"], { cwd: submoduleDir });
 
                     types = config.types;
 
                     cwd = config.path ? path.join(cwd, config.path) : submoduleDir;
                 }
                 if (fs.existsSync(path.join(cwd, "package.json"))) {
-                    if (fs.existsSync(path.join(cwd, "package-lock.json"))) {
+                    if (process.env.TRAVIS_EVENT_TYPE === "cron" && fs.existsSync(path.join(cwd, "package-lock.json"))) {
                         fs.unlinkSync(path.join(cwd, "package-lock.json"));
                     }
                     if (fs.existsSync(path.join(cwd, "node_modules"))) {
@@ -75,7 +77,7 @@ abstract class ExternalCompileRunnerBase extends RunnerBase {
                     exec("npm", ["i", "--ignore-scripts"], { cwd, timeout: timeout / 2 }); // NPM shouldn't take the entire timeout - if it takes a long time, it should be terminated and we should log the failure
                 }
                 const args = [path.join(Harness.IO.getWorkspaceRoot(), "built/local/tsc.js")];
-                if (types) {
+                if (types?.length) {
                     args.push("--types", types.join(","));
                     // Also actually install those types (for, eg, the js projects which need node)
                     exec("npm", ["i", ...types.map(t => `@types/${t}`), "--no-save", "--ignore-scripts"], { cwd: originalCwd, timeout: timeout / 2 }); // NPM shouldn't take the entire timeout - if it takes a long time, it should be terminated and we should log the failure

tests/baselines/reference/user/TypeScript-Vue-Starter.log

@@ -1,16 +1,12 @@
 Exit Code: 1
 Standard output:
-src/App.test.tsx(5,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.
-src/components/Hello.test.tsx(5,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.
-src/components/Hello.test.tsx(7,3): error TS2304: Cannot find name 'expect'.
-src/components/Hello.test.tsx(10,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.
-src/components/Hello.test.tsx(12,3): error TS2304: Cannot find name 'expect'.
-src/components/Hello.test.tsx(15,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.
-src/components/Hello.test.tsx(17,3): error TS2304: Cannot find name 'expect'.
-src/components/Hello.test.tsx(20,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.
-src/components/Hello.test.tsx(21,3): error TS2304: Cannot find name 'expect'.
-src/components/Hello.test.tsx(26,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.
-src/components/Hello.test.tsx(27,3): error TS2304: Cannot find name 'expect'.
+../../../../../node_modules/@types/mocha/index.d.ts(2680,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'beforeEach' must be of type 'Lifecycle', but here has type 'HookFunction'.
+../../../../../node_modules/@types/mocha/index.d.ts(2698,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'afterEach' must be of type 'Lifecycle', but here has type 'HookFunction'.
+../../../../../node_modules/@types/mocha/index.d.ts(2714,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'describe' must be of type 'Describe', but here has type 'SuiteFunction'.
+../../../../../node_modules/@types/mocha/index.d.ts(2735,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'xdescribe' must be of type 'Describe', but here has type 'PendingSuiteFunction'.
+../../../../../node_modules/@types/mocha/index.d.ts(2749,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'it' must be of type 'It', but here has type 'TestFunction'.
+../../../../../node_modules/@types/mocha/index.d.ts(2763,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'test' must be of type 'It', but here has type 'TestFunction'.
+../../../../../node_modules/@types/mocha/index.d.ts(2770,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'xit' must be of type 'It', but here has type 'PendingTestFunction'.
 
 
 

tests/baselines/reference/user/TypeScript-WeChat-Starter.log

@@ -1,5 +1,6 @@
 Exit Code: 1
 Standard output:
+../../../../../node_modules/@types/gulp/index.d.ts(9,27): error TS2307: Cannot find module 'chokidar'.
 lib/Accessibility.js(134,15): error TS2503: Cannot find namespace 'Protocol'.
 lib/Accessibility.js(344,7): error TS2322: Type 'string | number | boolean' is not assignable to type 'never'.
   Type 'string' is not assignable to type 'never'.
@@ -55,7 +56,7 @@ lib/Page.js(94,33): error TS2345: Argument of type 'CDPSession' is not assignabl
 lib/Page.js(147,15): error TS2503: Cannot find namespace 'Protocol'.
 lib/Page.js(220,15): error TS2503: Cannot find namespace 'Protocol'.
 lib/Page.js(388,20): error TS2503: Cannot find namespace 'Protocol'.
-lib/Page.js(451,7): error TS2740: Type '(...args: any[]) => Promise<any>' is missing the following properties from type 'Window': applicationCache, caches, clientInformation, closed, and 223 more.
+lib/Page.js(451,7): error TS2740: Type '(...args: any[]) => Promise<any>' is missing the following properties from type 'Window': applicationCache, caches, clientInformation, closed, and 242 more.
 lib/Page.js(461,9): error TS2349: This expression is not callable.
   Type 'Window' has no call signatures.
 lib/Page.js(497,15): error TS2503: Cannot find namespace 'Protocol'.