Skip to content

Commit e8778e8

Browse files
committed
fix project tests
1 parent 650b2d2 commit e8778e8

File tree

15 files changed

+29
-15
lines changed

15 files changed

+29
-15
lines changed

src/harness/projectsRunner.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ class ProjectRunner extends RunnerBase {
161161

162162
function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile {
163163
let sourceFile: ts.SourceFile = undefined;
164-
if (fileName === Harness.Compiler.defaultLibFileName) {
165-
sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(Harness.Compiler.getDefaultLibFileName(compilerOptions));
164+
if (Harness.isDefaultLibraryFile(fileName)) {
165+
sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
166166
}
167167
else {
168168
const text = getSourceFileText(fileName);
@@ -177,7 +177,7 @@ class ProjectRunner extends RunnerBase {
177177
function createCompilerHost(): ts.CompilerHost {
178178
return {
179179
getSourceFile,
180-
getDefaultLibFileName: () => Harness.Compiler.defaultLibFileName,
180+
getDefaultLibFileName: options => Harness.Compiler.getDefaultLibFileName(options),
181181
writeFile,
182182
getCurrentDirectory,
183183
getCanonicalFileName: Harness.Compiler.getCanonicalFileName,

tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"declaration": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"a.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"declaration": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"a.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"baselineCheck": true,
55
"runTest": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
8+
"lib.es3.d.ts",
89
"main.ts"
910
],
1011
"emittedFiles": [

tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compileOnSave": true,
33
"compilerOptions": {
44
"target": "es5",
5+
"lib": ["es3", "es5"],
56
"module": "commonjs",
67
"emitDecoratorMetadata": true,
78
"experimentalDecorators": true,

tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compileOnSave": true,
33
"compilerOptions": {
44
"target": "es5",
5+
"lib": ["es3", "es5"],
56
"module": "system",
67
"moduleResolution": "node",
78
"emitDecoratorMetadata": true,

0 commit comments

Comments
 (0)