@@ -19,11 +19,12 @@ var babel = require('gulp-babel');
19
19
var watch = require ( 'gulp-watch' ) ;
20
20
var batch = require ( 'gulp-batch' ) ;
21
21
var fs = require ( "fs" ) ;
22
+ var runSequence = require ( 'run-sequence' ) ;
22
23
23
24
gulp . task ( 'default' , [ "test" ] ) ;
24
25
25
26
/** Build all-in-one files for use in the browser */
26
- gulp . task ( 'browser' , [ 'nodejs' ] , function ( ) {
27
+ gulp . task ( 'browser' , function ( ) {
27
28
28
29
var browserOutput = 'build/browser' ;
29
30
var testFiles = [ ] ;
@@ -94,9 +95,13 @@ gulp.task('nodejs', function(){
94
95
} ) ;
95
96
} )
96
97
97
- gulp . task ( 'all' , [ 'nodejs' , 'browser' ] ) ;
98
+ gulp . task ( 'all' , function ( cb ) {
99
+ runSequence ( 'nodejs' , 'browser' , cb ) ;
100
+ } ) ;
98
101
99
- gulp . task ( 'test' , [ 'test-nodejs' , 'test-browser' ] ) ;
102
+ gulp . task ( 'test' , function ( cb ) {
103
+ runSequence ( 'test-nodejs' , 'test-browser' , cb ) ;
104
+ } ) ;
100
105
101
106
gulp . task ( 'start-neo4j' , [ 'download-neo4j' ] , shell . task ( [
102
107
'chmod +x build/neo4j-enterprise*/bin/neo4j' ,
@@ -118,10 +123,14 @@ gulp.task('test-nodejs', ['nodejs'], function () {
118
123
} ) ) ;
119
124
} ) ;
120
125
121
- gulp . task ( 'test-browser' , [ 'browser' ] , function ( ) {
126
+ gulp . task ( 'test-browser' , function ( cb ) {
127
+ runSequence ( 'all' , 'run-browser-test' , cb )
128
+ } ) ;
129
+
130
+ gulp . task ( 'run-browser-test' , function ( ) {
122
131
return gulp . src ( 'build/browser/neo4j-web.test.js' )
123
132
. pipe ( jasmineBrowser . specRunner ( { console : true } ) )
124
- . pipe ( jasmineBrowser . headless ( { driver : 'slimerjs' } ) ) ;
133
+ . pipe ( jasmineBrowser . headless ( { driver : 'slimerjs' } ) )
125
134
} ) ;
126
135
127
136
gulp . task ( 'watch' , function ( ) {
0 commit comments