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

test: fix language service tests in windows (#30113) 

This PR parially addresses #29785 and fixes ` //packages/language-service/test:test`

PR Close #30113
This commit is contained in:
Alan Agius 2019-04-25 15:07:39 +02:00 committed by Andrew Kushnir
parent 3efdd39a18
commit e4b81a6957
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/compiler-cli/test/test_support.ts
View File

@ -122,20 +122,21 @@ export function setupBazelTo(tmpDirPath: string) {
fs.mkdirSync(nodeModulesPath); fs.mkdirSync(nodeModulesPath);
fs.mkdirSync(angularDirectory); fs.mkdirSync(angularDirectory);
getAngularPackagesFromRunfiles().forEach( getAngularPackagesFromRunfiles().forEach(({pkgPath, name}) => {
({pkgPath, name}) => { fs.symlinkSync(pkgPath, path.join(angularDirectory, name), 'dir'); }); fs.symlinkSync(pkgPath, path.join(angularDirectory, name), 'junction');
});
// Link typescript // Link typescript
const typeScriptSource = resolveNpmTreeArtifact('npm/node_modules/typescript'); const typeScriptSource = resolveNpmTreeArtifact('npm/node_modules/typescript');
const typescriptDest = path.join(nodeModulesPath, 'typescript'); const typescriptDest = path.join(nodeModulesPath, 'typescript');
fs.symlinkSync(typeScriptSource, typescriptDest, 'dir'); fs.symlinkSync(typeScriptSource, typescriptDest, 'junction');
// Link "rxjs" if it has been set up as a runfile. "rxjs" is linked optionally because // Link "rxjs" if it has been set up as a runfile. "rxjs" is linked optionally because
// not all compiler-cli tests need "rxjs" set up. // not all compiler-cli tests need "rxjs" set up.
try { try {
const rxjsSource = resolveNpmTreeArtifact('rxjs', 'index.js'); const rxjsSource = resolveNpmTreeArtifact('rxjs', 'index.js');
const rxjsDest = path.join(nodeModulesPath, 'rxjs'); const rxjsDest = path.join(nodeModulesPath, 'rxjs');
fs.symlinkSync(rxjsSource, rxjsDest, 'dir'); fs.symlinkSync(rxjsSource, rxjsDest, 'junction');
} catch (e) { } catch (e) {
if (e.code !== 'MODULE_NOT_FOUND') throw e; if (e.code !== 'MODULE_NOT_FOUND') throw e;
} }

12
packages/language-service/test/reflector_host_spec.ts
View File

@ -7,12 +7,8 @@
*/ */
import * as path from 'path'; import * as path from 'path';
import * as ts from 'typescript';
import {createLanguageService} from '../src/language_service';
import {ReflectorHost} from '../src/reflector_host'; import {ReflectorHost} from '../src/reflector_host';
import {Completions, LanguageService} from '../src/types';
import {TypeScriptServiceHost} from '../src/typescript_host';
import {toh} from './test_data'; import {toh} from './test_data';
import {MockTypescriptHost} from './test_utils'; import {MockTypescriptHost} from './test_utils';
@ -25,12 +21,14 @@ describe('reflector_host_spec', () => {
let mockHost = new MockTypescriptHost( let mockHost = new MockTypescriptHost(
['/app/main.ts', '/app/parsing-cases.ts'], toh, 'app/node_modules', ['/app/main.ts', '/app/parsing-cases.ts'], toh, 'app/node_modules',
{...path, join: (...args: string[]) => originalJoin.apply(path, args)}); {...path, join: (...args: string[]) => originalJoin.apply(path, args)});
let service = ts.createLanguageService(mockHost);
let ngHost = new TypeScriptServiceHost(mockHost, service);
let ngService = createLanguageService(ngHost);
const reflectorHost = new ReflectorHost(() => undefined as any, mockHost, {basePath: '\\app'}); const reflectorHost = new ReflectorHost(() => undefined as any, mockHost, {basePath: '\\app'});
if (process.platform !== 'win32') {
// If we call this in Windows it will cause a 'Maximum call stack size exceeded error'
// Because we are spying on the same function that we are call faking
spyOn(path, 'join').and.callFake((...args: string[]) => { return path.win32.join(...args); }); spyOn(path, 'join').and.callFake((...args: string[]) => { return path.win32.join(...args); });
}
const result = reflectorHost.moduleNameToFileName('@angular/core'); const result = reflectorHost.moduleNameToFileName('@angular/core');
expect(result).not.toBeNull('could not find @angular/core using path.win32'); expect(result).not.toBeNull('could not find @angular/core using path.win32');
}); });