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

test(aio): fix tests for example-boilerplate (#18619)

Browse Source 
PR #18520 was accidentally merged into 4.3.x, which uses a different
location for building `tsc-wrapped`. This commit reverts the changes
from #18520 that were not compatible with 4.3.x.
This commit is contained in:
George Kalpakas 2017-08-10 06:28:43 +03:00 committed by Victor Berchet
parent f4cb45345d
commit 77fa3c3e48
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aio/tools/examples/example-boilerplate.js
View File

@ -41,9 +41,12 @@ const ANGULAR_PACKAGES = [
'platform-browser-dynamic', 'platform-browser-dynamic',
'platform-server', 'platform-server',
'router', 'router',
'tsc-wrapped',
'upgrade', 'upgrade',
]; ];
const ANGULAR_TOOLS_PACKAGES_PATH = path.resolve(ANGULAR_DIST_PATH, 'tools', '@angular');
const ANGULAR_TOOLS_PACKAGES = [
'tsc-wrapped'
];
const EXAMPLE_CONFIG_FILENAME = 'example-config.json'; const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
@ -60,6 +63,7 @@ class ExampleBoilerPlate {
// Replace the Angular packages with those from the dist folder, if necessary // Replace the Angular packages with those from the dist folder, if necessary
if (useLocal) { if (useLocal) {
ANGULAR_PACKAGES.forEach(packageName => this.overridePackage(ANGULAR_PACKAGES_PATH, packageName)); ANGULAR_PACKAGES.forEach(packageName => this.overridePackage(ANGULAR_PACKAGES_PATH, packageName));
ANGULAR_TOOLS_PACKAGES.forEach(packageName => this.overridePackage(ANGULAR_TOOLS_PACKAGES_PATH, packageName));
} }
// Get all the examples folders, indicated by those that contain a `example-config.json` file // Get all the examples folders, indicated by those that contain a `example-config.json` file
@ -133,4 +137,4 @@ module.exports = new ExampleBoilerPlate();
// If this file was run directly then run the main function, // If this file was run directly then run the main function,
if (require.main === module) { if (require.main === module) {
module.exports.main(); module.exports.main();
} }

2
aio/tools/examples/example-boilerplate.spec.js
View File

@ -32,7 +32,7 @@ describe('example-boilerplate tool', () => {
// for example // for example
expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'common'); expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'common');
expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'core'); expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'core');
expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'tsc-wrapped'); expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/tools/@angular'), 'tsc-wrapped');
}); });
it('should process all the example folders', () => { it('should process all the example folders', () => {