ci: update e2e to use 6.0.0-rc.0

angular · Mar 21, 2018 · ccf2965 · ccf2965
1 parent 916731c
commit ccf2965
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -16,7 +16,7 @@ test_script:
   - npm --version
   - npm run test:packages
   - npm run test:cli
-  - node tests\run_e2e.js --appveyor --ng-version="6.0.0-beta.8" "--glob=tests/{basic,commands,generate,build/styles}/**"
+  - node tests\run_e2e.js --appveyor --ng-version="6.0.0-rc.0" "--glob=tests/{basic,commands,generate,build/styles}/**"
 
 build: off
 

diff --git a/.travis.yml b/.travis.yml
@@ -36,19 +36,19 @@ matrix:
       env: test
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent --ng-version="6.0.0-beta.8"
+      script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-0
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent --ng-version="6.0.0-beta.8"
+      script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-1
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent --ng-version="6.0.0-beta.8"
+      script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-2
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent --ng-version="6.0.0-beta.8"
+      script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-3
     - node_js: "8"
       os: linux

diff --git a/tests/e2e/utils/project.ts b/tests/e2e/utils/project.ts
@@ -1,6 +1,7 @@
 import { readFile, writeFile, replaceInFile } from './fs';
 import { execAndWaitForOutputToMatch, silentNpm, ng } from './process';
 import { getGlobalVariable } from './env';
+import { intersects } from 'semver';
 
 const packages = require('../../../lib/packages').packages;
 
@@ -156,9 +157,10 @@ export function useNgVersion(version: string) {
       });
     // TODO: determine the appropriate version for the Angular version
     if (version.startsWith('^5')) {
-      json['devDependencies']['typescript'] = '~2.6.0';
+      json['devDependencies']['typescript'] = '~2.5.0';
     } else {
       json['devDependencies']['typescript'] = '~2.7.0';
+      json['dependencies']['rxjs'] = '6.0.0-beta.0';
     }
   });
 }