cargdev/angular
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "test(compiler-cli): ensure indexer tests are not brittle to case-sensitivity (#36968)" (#37003)

Browse Source 
This reverts commit 3361f59a4f.

The changes to the case-sensitivity handling in #36968 caused multiple
projects to fail to build. See #36992, #36993 and #37000.

The issue is related to the logical path handling. But it is felt that
it is safer to revert the entire PR and then to investigate further.

PR Close #37003
This commit is contained in:
Pete Bacon Darwin
2020-05-08 13:33:53 +01:00
committed by Alex Rickabaugh
parent 04fd90e32a
commit bf446cb2d5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/compiler-cli/src/ngtsc/indexer/test/context_spec.ts
View File

@ -23,7 +23,7 @@ runInEachFileSystem(() => {
boundTemplate, boundTemplate,
templateMeta: { templateMeta: {
isInline: false, isInline: false,
file: new ParseSourceFile('<div></div>', declaration.getSourceFile().fileName), file: new ParseSourceFile('<div></div>', util.getTestFilePath()),
}, },
}); });
@ -34,7 +34,7 @@ runInEachFileSystem(() => {
boundTemplate, boundTemplate,
templateMeta: { templateMeta: {
isInline: false, isInline: false,
file: new ParseSourceFile('<div></div>', declaration.getSourceFile().fileName), file: new ParseSourceFile('<div></div>', util.getTestFilePath()),
}, },
}, },
])); ]));

10
packages/compiler-cli/src/ngtsc/indexer/test/transform_spec.ts
View File

@ -25,7 +25,7 @@ function populateContext(
boundTemplate, boundTemplate,
templateMeta: { templateMeta: {
isInline, isInline,
file: new ParseSourceFile(template, component.getSourceFile().fileName), file: new ParseSourceFile(template, util.getTestFilePath()),
}, },
}); });
} }
@ -45,12 +45,12 @@ runInEachFileSystem(() => {
expect(info).toEqual({ expect(info).toEqual({
name: 'C', name: 'C',
selector: 'c-selector', selector: 'c-selector',
file: new ParseSourceFile('class C {}', decl.getSourceFile().fileName), file: new ParseSourceFile('class C {}', util.getTestFilePath()),
template: { template: {
identifiers: getTemplateIdentifiers(util.getBoundTemplate('<div>{{foo}}</div>')), identifiers: getTemplateIdentifiers(util.getBoundTemplate('<div>{{foo}}</div>')),
usedComponents: new Set(), usedComponents: new Set(),
isInline: false, isInline: false,
file: new ParseSourceFile('<div>{{foo}}</div>', decl.getSourceFile().fileName), file: new ParseSourceFile('<div>{{foo}}</div>', util.getTestFilePath()),
} }
}); });
}); });
@ -69,7 +69,7 @@ runInEachFileSystem(() => {
const info = analysis.get(decl); const info = analysis.get(decl);
expect(info).toBeDefined(); expect(info).toBeDefined();
expect(info!.template.file) expect(info!.template.file)
.toEqual(new ParseSourceFile('class C {}', decl.getSourceFile().fileName)); .toEqual(new ParseSourceFile('class C {}', util.getTestFilePath()));
}); });
it('should give external templates their own source file', () => { it('should give external templates their own source file', () => {
@ -84,7 +84,7 @@ runInEachFileSystem(() => {
const info = analysis.get(decl); const info = analysis.get(decl);
expect(info).toBeDefined(); expect(info).toBeDefined();
expect(info!.template.file) expect(info!.template.file)
.toEqual(new ParseSourceFile('<div>{{foo}}</div>', decl.getSourceFile().fileName)); .toEqual(new ParseSourceFile('<div>{{foo}}</div>', util.getTestFilePath()));
}); });
it('should emit used components', () => { it('should emit used components', () => {

2
packages/compiler-cli/src/ngtsc/indexer/test/util.ts
View File

@ -16,7 +16,7 @@ import {getDeclaration, makeProgram} from '../../testing';
import {ComponentMeta} from '../src/context'; import {ComponentMeta} from '../src/context';
/** Dummy file URL */ /** Dummy file URL */
function getTestFilePath(): AbsoluteFsPath { export function getTestFilePath(): AbsoluteFsPath {
return absoluteFrom('/TEST_FILE.ts'); return absoluteFrom('/TEST_FILE.ts');
} }