updated files accordantly

This commit is contained in:
Carlos Jimenez 2018-02-01 16:01:49 +01:00
parent c94fe12f91
commit a7f4736c12
3 changed files with 6 additions and 9 deletions

View File

@ -55,7 +55,7 @@ $ karma start
For server-side unit tests run from project's root.
```
$ gulp test
$ npm run test
```
For end-to-end tests run from project's root.

View File

@ -58,20 +58,16 @@ gulp.task('services-run', ['nginx'], () => {
});
});
gulp.task('test', callback => {
return require('./services_tests').start();
});
gulp.task('e2e', ['docker-wait'], callback => {
gulp.task('e2e', ['docker-wait'], () => {
return gulp.start('e2e-run');
});
gulp.task('e2e-run', callback => {
gulp.task('e2e-run', () => {
gulp.src('./e2e_tests.js')
.pipe(jasmine({reporter: 'none'}));
});
gulp.task('clean', function() {
gulp.task('clean', () => {
return del([`${buildDir}/*`, `!${buildDir}/templates`, `!${buildDir}/images`], {force: true});
});
@ -186,7 +182,7 @@ gulp.task('watch', function() {
gulp.watch(localeFiles, ['locales']);
});
// E2E tests
// Docker
gulp.task('docker', callback => {
runSequence('docker-delete', 'docker-delete-image', 'docker-build', 'docker-run', callback);

View File

@ -71,6 +71,7 @@
"webpack-dev-server": "^2.2.0"
},
"scripts": {
"test": "nodemon -q services_tests.js -w services",
"lint": "eslint ./ --cache --ignore-pattern .gitignore"
}
}