-
Notifications
You must be signed in to change notification settings - Fork 12k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(@angular-devkit/build-angular): handle windows spec collisions
(cherry picked from commit 9e2d3fb)
- Loading branch information
1 parent
4a5c5e4
commit 23667ed
Showing
4 changed files
with
118 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
packages/angular_devkit/build_angular/src/builders/karma/find-tests_spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/** | ||
* @license | ||
* Copyright Google LLC All Rights Reserved. | ||
* | ||
* Use of this source code is governed by an MIT-style license that can be | ||
* found in the LICENSE file at https://angular.dev/license | ||
*/ | ||
|
||
import { getTestEntrypoints } from './find-tests'; | ||
|
||
const UNIX_ENTRYPOINTS_OPTIONS = { | ||
pathSeparator: '/', | ||
workspaceRoot: '/my/workspace/root', | ||
projectSourceRoot: '/my/workspace/root/src-root', | ||
}; | ||
|
||
const WINDOWS_ENTRYPOINTS_OPTIONS = { | ||
pathSeparator: '\\', | ||
workspaceRoot: 'C:\\my\\workspace\\root', | ||
projectSourceRoot: 'C:\\my\\workspace\\root\\src-root', | ||
}; | ||
|
||
describe('getTestEntrypoints', () => { | ||
for (const options of [UNIX_ENTRYPOINTS_OPTIONS, WINDOWS_ENTRYPOINTS_OPTIONS]) { | ||
describe(`with path separator "${options.pathSeparator}"`, () => { | ||
function joinWithSeparator(base: string, rel: string) { | ||
return `${base}${options.pathSeparator}${rel.replace(/\//g, options.pathSeparator)}`; | ||
} | ||
|
||
function getEntrypoints(workspaceRelative: string[], sourceRootRelative: string[] = []) { | ||
return getTestEntrypoints( | ||
[ | ||
...workspaceRelative.map((p) => joinWithSeparator(options.workspaceRoot, p)), | ||
...sourceRootRelative.map((p) => joinWithSeparator(options.projectSourceRoot, p)), | ||
], | ||
options, | ||
); | ||
} | ||
|
||
it('returns an empty map without test files', () => { | ||
expect(getEntrypoints([])).toEqual(new Map()); | ||
}); | ||
|
||
it('strips workspace root and/or project source root', () => { | ||
expect(getEntrypoints(['a/b.spec.js'], ['c/d.spec.js'])).toEqual( | ||
new Map<string, string>([ | ||
['spec-a-b.spec', joinWithSeparator(options.workspaceRoot, 'a/b.spec.js')], | ||
['spec-c-d.spec', joinWithSeparator(options.projectSourceRoot, 'c/d.spec.js')], | ||
]), | ||
); | ||
}); | ||
|
||
it('adds unique prefixes to distinguish between similar names', () => { | ||
expect(getEntrypoints(['a/b/c/d.spec.js', 'a-b/c/d.spec.js'], ['a/b-c/d.spec.js'])).toEqual( | ||
new Map<string, string>([ | ||
['spec-a-b-c-d.spec', joinWithSeparator(options.workspaceRoot, 'a/b/c/d.spec.js')], | ||
['spec-a-b-c-d-2.spec', joinWithSeparator(options.workspaceRoot, 'a-b/c/d.spec.js')], | ||
[ | ||
'spec-a-b-c-d-3.spec', | ||
joinWithSeparator(options.projectSourceRoot, 'a/b-c/d.spec.js'), | ||
], | ||
]), | ||
); | ||
}); | ||
}); | ||
} | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters