chore(gulp): Fixed coveralls, fixed wrong dependencies

dominique-mueller · Dec 21, 2016 · ebfb393 · ebfb393
1 parent 923488a
commit ebfb393
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,9 +29,7 @@ before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start # Run xvfb to fake a display (muhaha ...)
 script:
-  - npm run gulp test && npm run gulp build--publish # First test, then build for npm publish
-after_success:
-  - npm run coveralls
+  - npm run gulp test && npm run coveralls && npm run gulp build--publish # First test, then build for npm publish
 
 before_deploy: # Automatic semantic release
   - git config --global user.name "dominique-mueller"; # Setup git

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![dev dependency status](https://img.shields.io/david/dev/dominique-mueller/angular-notifier.svg?maxAge=2592000&style=flat-square)](https://david-dm.org/dominique-mueller/angular-notifier?type=dev)
 [![peer dependency status](https://img.shields.io/david/peer/dominique-mueller/angular-notifier.svg?maxAge=2592000&style=flat-square)](https://david-dm.org/dominique-mueller/angular-notifier?type=peer)
 [![travis ci build status](https://img.shields.io/travis/dominique-mueller/angular-notifier/master.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/dominique-mueller/angular-notifier)
-[![Codecov](https://img.shields.io/codecov/c/github/dominique-mueller/angular-notifier/master.svg?maxAge=2592000&style=flat-square)]()
+[![Coveralls](https://img.shields.io/coveralls/dominique-mueller/angular-notifier/master.svg?style=flat-square)](https://coveralls.io/github/dominique-mueller/angular-notifier)
 [![license](https://img.shields.io/npm/l/angular-notifier.svg?maxAge=2592000&style=flat-square)](https://github.com/dominique-mueller/angular-notifier/LICENSE)
 
 # angular-notifier

diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "peerDependencies": {
         "@angular/core": "2.x",
         "@angular/common": "2.x",
-        "rxjs": "5.0.0-rc.4"
+        "rxjs": "5.0.1"
     },
     "devDependencies": {
         "@angular/core": "2.x",
@@ -52,7 +52,7 @@
         "@angular/platform-browser-dynamic": "2.x",
         "@types/jasmine": "2.5.x",
         "browser-sync": "2.18.x",
-        "codelyzer": "2.0.0-beta.3",
+        "codelyzer": "2.0.0-beta.4",
         "conventional-github-releaser": "1.1.x",
         "conventional-recommended-bump": "0.3.x",
         "core-js": "2.4.x",
@@ -61,14 +61,14 @@
         "gulp": "github:gulpjs/gulp#4.0",
         "gulp-autoprefixer": "3.1.x",
         "gulp-bump": "2.5.x",
-        "gulp-clean-css": "2.0.x",
+        "gulp-clean-css": "2.3.x",
         "gulp-conventional-changelog": "1.1.x",
         "gulp-git": "1.12.x",
         "gulp-inline-ng2-template": "4.0.x",
         "gulp-insert": "0.5.x",
         "gulp-rename": "1.2.x",
         "gulp-sourcemaps": "2.2.x",
-        "gulp-sass": "2.3.x",
+        "gulp-sass": "3.0.x",
         "gulp-sass-lint": "1.3.x",
         "gulp-tslint": "7.0.x",
         "gulp-typescript": "3.1.x",
@@ -79,14 +79,14 @@
         "karma-chrome-launcher": "2.0.x",
         "karma-cli": "1.0.x",
         "karma-coverage": "1.1.x",
-        "karma-jasmine": "1.0.x",
+        "karma-jasmine": "1.1.x",
         "karma-mocha-reporter": "2.2.x",
         "merge2": "1.0.x",
         "progress-bar-webpack-plugin": "1.9.x",
         "reflect-metadata": "0.1.x",
         "remap-istanbul": "0.8.x",
         "require-dir": "0.3.x",
-        "rxjs": "5.0.0-rc.4",
+        "rxjs": "5.0.1",
         "source-map-loader": "0.1.x",
         "systemjs": "0.19.x",
         "tslint": "4.0.x",

diff --git a/src/components/notifier-notification.component.spec.ts b/src/components/notifier-notification.component.spec.ts
@@ -353,7 +353,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -389,7 +389,7 @@ export function main(): void {
 					return {
 						finished: new Promise<undefined>( ( resolve: () => void, reject: () => void ) => {
 							componentFixture.debugElement.styles[ 'transform' ] =
-								`translate3d( 0, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
+								`translate3d( 0, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
 							resolve();
 						} )
 					};
@@ -400,7 +400,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -438,7 +438,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 - shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ -shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -473,7 +473,7 @@ export function main(): void {
 					return {
 						finished: new Promise<undefined>( ( resolve: () => void, reject: () => void ) => {
 							componentFixture.debugElement.styles[ 'transform' ] =
-								`translate3d( 0, ${ 0 - shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
+								`translate3d( 0, ${ -shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
 							resolve();
 						} )
 					};
@@ -484,7 +484,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 - shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ -shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -522,7 +522,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 - shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ -shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -557,7 +557,7 @@ export function main(): void {
 					return {
 						finished: new Promise<undefined>( ( resolve: () => void, reject: () => void ) => {
 							componentFixture.debugElement.styles[ 'transform' ] =
-								`translate3d( 0, ${ 0 - shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
+								`translate3d( 0, ${ -shiftDistance - testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
 							resolve();
 						} )
 					};
@@ -606,7 +606,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -641,7 +641,7 @@ export function main(): void {
 					return {
 						finished: new Promise<undefined>( ( resolve: () => void, reject: () => void ) => {
 							componentFixture.debugElement.styles[ 'transform' ] =
-								`translate3d( 0, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
+								`translate3d( 0, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
 							resolve();
 						} )
 					};
@@ -652,7 +652,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( 0, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( 0, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -690,7 +690,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( -50%, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( -50%, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );
@@ -728,7 +728,7 @@ export function main(): void {
 					return {
 						finished: new Promise<undefined>( ( resolve: () => void, reject: () => void ) => {
 							componentFixture.debugElement.styles[ 'transform' ] =
-								`translate3d( -50%, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
+								`translate3d( -50%, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )`; // Fake animation result
 							resolve();
 						} )
 					};
@@ -739,7 +739,7 @@ export function main(): void {
 				tick();
 
 				expect( componentFixture.debugElement.styles[ 'transform' ] )
-					.toBe( `translate3d( -50%, ${ 0 + shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
+					.toBe( `translate3d( -50%, ${ shiftDistance + testNotifierConfig.position.vertical.gap }px, 0 )` );
 				expect( shiftCallback ).toHaveBeenCalled();
 
 			} ) );

diff --git a/tools/gulp/ts/ts-test.task.js b/tools/gulp/ts/ts-test.task.js
@@ -3,7 +3,7 @@
 const gulp = require( 'gulp' );
 const karma = require( 'karma' );
 const path = require( 'path' );
-const remapIstanbul = require( 'remap-istanbul/lib/gulpRemapIstanbul' ).default;
+const remapIstanbul = require( 'remap-istanbul/lib/gulpRemapIstanbul' );
 
 /**
  * Gulp task: Run TypeScript unit tests