Tests when the .ts and .js files are mixed in compilation with tscconfig file specifying them

sheetalkamat · sheetalkamat · commit dbb2772ed8af · 2015-09-16T12:47:45.000-07:00
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "DifferentNamesSpecified",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "DifferentNamesSpecified/a.ts",
+        "DifferentNamesSpecified/b.js"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
@@ -0,0 +1,2 @@
+declare var test: number;
+declare var test2: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
@@ -0,0 +1,2 @@
+var test = 10;
+var test2 = 10; // Should get compiled
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "DifferentNamesSpecified",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "DifferentNamesSpecified/a.ts",
+        "DifferentNamesSpecified/b.js"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
@@ -0,0 +1,2 @@
+declare var test: number;
+declare var test2: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
@@ -0,0 +1,2 @@
+var test = 10;
+var test2 = 10; // Should get compiled
diff --git a/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json
@@ -0,0 +1,7 @@
+{
+  "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json",
+  "projectRoot": "tests/cases/projects/jsFileCompilation",
+  "baselineCheck": true,
+  "declaration": true,
+  "project": "DifferentNamesSpecified"
+}
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js
@@ -0,0 +1 @@
+var test2 = 10; // Should get compiled
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "compilerOptions": { "out": "test.js" },
+  "files": [ "a.ts", "b.js" ]
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+declare var test: number;`
	`2`	`+declare var test2: number;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+var test = 10;`
	`2`	`+var test2 = 10; // Should get compiled`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "compilerOptions": { "out": "test.js" },
 +  "files": [ "a.ts", "b.js" ]
 +}