Skip to content

Commit 6daa877

Browse files
authored
Merge pull request #31 from atais/development
using concurrently for better test process handling
2 parents 6055244 + b582880 commit 6daa877

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"homepage": "https://github.com/atais/angular-eonasdan-datetimepicker",
2323
"scripts": {
2424
"pretest": "npm install",
25-
"test": "(npm start > /dev/null &) && (gulp protractor)",
25+
"test": "concurrently -k -s first 'npm start' 'gulp protractor'",
2626
"start": "http-server -a localhost -p 8000 -c-1 ./",
27-
"dev": "(npm start > /dev/null &) && (gulp dev)"
27+
"dev": "concurrently -k 'npm start' 'gulp dev'"
2828
},
2929
"peerDependencies": {
3030
"angular": "*",
@@ -34,18 +34,19 @@
3434
"jquery": "~2"
3535
},
3636
"devDependencies": {
37+
"concurrently": "^3.5.0",
3738
"gulp": "3.9.1",
3839
"gulp-angular-protractor": "1.0.0",
39-
"protractor": "4.0.11",
40-
"webdriver-manager": "10.2.8",
4140
"gulp-debug": "^2.1.2",
4241
"gulp-jshint": "^2.0.0",
4342
"gulp-ng-annotate": "^1.1.0",
4443
"gulp-rename": "^1.2.2",
4544
"gulp-uglify": "^1.5.1",
4645
"http-server": "^0.9.0",
4746
"jasmine-reporters": "2.2.0",
48-
"jshint": "^2.9.1"
47+
"jshint": "^2.9.1",
48+
"protractor": "4.0.11",
49+
"webdriver-manager": "10.2.8"
4950
},
5051
"dependencies": {
5152
"angular": "^1.6.1",

0 commit comments

Comments
 (0)