From a0852233314953fd458697b8bea9f267c2ea8e70 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Thu, 20 Jul 2017 21:19:01 +0100 Subject: [PATCH] ci(aio): test the example e2e files using local build of Angular --- aio/tools/examples/run-example-e2e.js | 6 +++++- scripts/ci/test-aio-e2e.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js index 369fabd654..0b4e978592 100644 --- a/aio/tools/examples/run-example-e2e.js +++ b/aio/tools/examples/run-example-e2e.js @@ -25,6 +25,10 @@ const IGNORED_EXAMPLES = [ * --setup run yarn install, copy boilerplate and update webdriver * e.g. --setup * + * --local to use the locally built Angular packages, rather than versions from npm + * Must be used in conjunction with --setup as this is when the packages are copied. + * e.g. --setup --local + * * --shard to shard the specs into groups to allow you to run them in parallel * e.g. --shard=0/2 // the even specs: 0, 2, 4, etc * e.g. --shard=1/2 // the odd specs: 1, 3, 5, etc @@ -35,7 +39,7 @@ function runE2e() { if (argv.setup) { // Run setup. console.log('runE2e: copy boilerplate'); - const spawnInfo = spawnExt('yarn', ['boilerplate:add'], { cwd: AIO_PATH }); + const spawnInfo = spawnExt('yarn', ['boilerplate:add', argv.local ? '-- --local': ''], { cwd: AIO_PATH }); promise = spawnInfo.promise .then(() => { console.log('runE2e: update webdriver'); diff --git a/scripts/ci/test-aio-e2e.sh b/scripts/ci/test-aio-e2e.sh index 41b7b78799..23fb8eaefb 100755 --- a/scripts/ci/test-aio-e2e.sh +++ b/scripts/ci/test-aio-e2e.sh @@ -13,6 +13,6 @@ source ${thisDir}/_travis-fold.sh # Run example e2e tests travisFoldStart "test.aio.example-e2e" - yarn example-e2e -- --setup --shard=${AIO_SHARD}/2 + yarn example-e2e -- --setup --local --shard=${AIO_SHARD}/2 travisFoldEnd "test.aio.example-e2e" )