Skip to content

Commit

Permalink
Add tests angular6 (DevExpress#720)
Browse files Browse the repository at this point in the history
* Add tests on Angular 6 to shippable config

* Fix systemjs config for rxjs 6
  • Loading branch information
anna-zhernovkova committed Mar 22, 2018
1 parent 20ef8bf commit 2e35fa8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 3 additions & 1 deletion karma.systemjs.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@
'jszip': 'npm:jszip/dist/jszip.min.js',

// other libraries
'rxjs': 'npm:rxjs'
'rxjs': 'npm:rxjs',
'rxjs/operators': 'npm:rxjs/operators/index.js'
},
packages: {
app: {
main: './main.js',
defaultExtension: 'js'
},
rxjs: {
main: 'index.js',
defaultExtension: 'js'
},
'dist': {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"@angular/core": "~4.4.5",
"@angular/common": "~4.4.5",
"@angular/compiler": "~4.4.5",
"@angular/compiler-cli": "~4.4.5",
"@angular/forms": "~4.4.5",
"@angular/http": "~4.4.5",
"@angular/platform-browser": "~4.4.5",
"@angular/platform-browser-dynamic": "~4.4.5",
"@angular/compiler-cli": "~4.4.5",
"@types/dot": "^1.0.29",
"@types/jasmine": "2.5.38",
"@types/mkdirp": "^0.3.29",
Expand Down
7 changes: 5 additions & 2 deletions shippable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ build:
ci:
- shippable_retry npm install --unsafe-perm
- gulp test
- shippable_retry npm install @angular/core@^5.0.0-rc.1 @angular/common@^5.0.0-rc.1 @angular/forms@^5.0.0-rc.1 @angular/compiler@^5.0.0-rc.1 @angular/platform-browser@^5.0.0-rc.1 @angular/platform-browser-dynamic@^5.0.0-rc.1 --unsafe-perm
- shippable_retry npm install @angular/core@^2.4.2 @angular/common@^2.4.2 @angular/compiler@^2.4.2 @angular/compiler-cli@^2.4.2 @angular/forms@^2.4.2 @angular/http@^2.4.2 @angular/platform-browser@^2.4.2 @angular/platform-browser-dynamic@^2.4.2 --unsafe-perm
- gulp build.tests
- gulp run.tests
- shippable_retry npm install @angular/core@^2.4.2 @angular/common@^2.4.2 @angular/forms@^2.4.2 @angular/compiler@^2.4.2 @angular/platform-browser@^2.4.2 @angular/platform-browser-dynamic@^2.4.2 --unsafe-perm
- shippable_retry npm install @angular/core@^5.0.0 @angular/common@^5.0.0 @angular/compiler@^5.0.0 @angular/compiler-cli@^5.0.0 @angular/forms@^5.0.0 @angular/http@^5.0.0 @angular/platform-browser@^5.0.0 @angular/platform-browser-dynamic@^5.0.0 --unsafe-perm
- gulp build.tests
- gulp run.tests
- shippable_retry npm install rxjs@^6.0.0-0 @angular/core@^6.0.0-0 @angular/common@^6.0.0-0 @angular/compiler@^6.0.0-0 @angular/compiler-cli@^6.0.0-0 @angular/forms@^6.0.0-0 @angular/http@^6.0.0-0 @angular/platform-browser@^6.0.0-0 @angular/platform-browser-dynamic@^6.0.0-0 --unsafe-perm
- gulp build.tests
- gulp run.tests

0 comments on commit 2e35fa8

Please sign in to comment.