honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: remove unused "test.sh" leftover code in language-service (#28352) 

Since we recently removed the `test.sh` script, and now run all
tests with Bazel, we can remove the unused logic that makes language-service
tests pass in non-Bazel.

This cleans up the tests, and also makes it easier to write tests
without worrying about two ways of the Angular package output
(Bazel `ng_package` rules vs. old `build.sh` logic of building)

PR Close #28352
This commit is contained in:
Paul Gschwendtner 2019-01-25 19:46:11 +01:00 committed by Matias Niemelä
parent 4aa189da67
commit e11ac7f24b
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/language-service/test/test_utils.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {isInBazel, setup} from '@angular/compiler-cli/test/test_support'; import {setup} from '@angular/compiler-cli/test/test_support';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import * as ts from 'typescript'; import * as ts from 'typescript';
@ -76,20 +76,9 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
constructor( constructor(
private scriptNames: string[], private data: MockData, private scriptNames: string[], private data: MockData,
private node_modules: string = 'node_modules', private myPath: typeof path = path) { private node_modules: string = 'node_modules', private myPath: typeof path = path) {
const moduleFilename = module.filename.replace(/\\/g, '/'); const support = setup();
if (isInBazel()) { this.nodeModulesPath = path.join(support.basePath, 'node_modules');
const support = setup(); this.angularPath = path.join(this.nodeModulesPath, '@angular');
this.nodeModulesPath = path.join(support.basePath, 'node_modules');
this.angularPath = path.join(this.nodeModulesPath, '@angular');
} else {
const angularIndex = moduleFilename.indexOf('@angular');
if (angularIndex >= 0)
this.angularPath =
moduleFilename.substr(0, angularIndex).replace('/all/', '/all/@angular/');
const distIndex = moduleFilename.indexOf('/dist/all');
if (distIndex >= 0)
this.nodeModulesPath = myPath.join(moduleFilename.substr(0, distIndex), 'node_modules');
}
this.options = { this.options = {
target: ts.ScriptTarget.ES5, target: ts.ScriptTarget.ES5,
module: ts.ModuleKind.CommonJS, module: ts.ModuleKind.CommonJS,