This repository was archived by the owner on Jul 29, 2024. It is now read-only.
File tree 2 files changed +13
-10
lines changed
2 files changed +13
-10
lines changed Original file line number Diff line number Diff line change 1
1
language : node_js
2
2
sudo : false
3
3
node_js :
4
+ - " 0.10"
4
5
- " 0.12"
5
6
- " 4"
6
7
@@ -20,6 +21,8 @@ matrix:
20
21
exclude :
21
22
- env : JOB=smoke
22
23
node_js : " 0.12"
24
+ - env : JOB=smoke
25
+ node_js : " 0.10"
23
26
24
27
25
28
before_script :
Original file line number Diff line number Diff line change @@ -98,23 +98,23 @@ ConfigParser.resolveFilePatterns =
98
98
for ( var i = 0 ; i < patterns . length ; ++ i ) {
99
99
// Cucumber allows running a spec given a line number. See
100
100
// https://github.com/angular/protractor/issues/2413
101
- var lineNumber = '' ;
102
- var parsedPath = path . parse ( patterns [ i ] ) ;
103
- parsedPath . base = parsedPath . base . replace ( / : \d + / , function ( match ) {
104
- lineNumber = match ;
105
- return '' ;
106
- } ) ;
107
-
108
- var filePath = path . format ( parsedPath ) ;
109
- var matches = glob . sync ( filePath , { cwd : cwd } ) ;
101
+ // TODO: when we deprecated node < v0.12 switch to using path.parse as in
102
+ // d6aebbad6e9b191fef141472887637ee4318438e
103
+ var fileName = patterns [ i ] ;
104
+ var lineNumber = / : \d + $ / . exec ( fileName ) ;
105
+ if ( lineNumber ) {
106
+ fileName = fileName . slice ( 0 , lineNumber . index ) ;
107
+ lineNumber = lineNumber [ 0 ] . slice ( 1 ) ;
108
+ }
109
+ var matches = glob . sync ( fileName , { cwd : cwd } ) ;
110
110
111
111
if ( ! matches . length && ! opt_omitWarnings ) {
112
112
log . warn ( 'pattern ' + patterns [ i ] + ' did not match any files.' ) ;
113
113
}
114
114
for ( var j = 0 ; j < matches . length ; ++ j ) {
115
115
var resolvedPath = path . resolve ( cwd , matches [ j ] ) ;
116
116
if ( lineNumber ) {
117
- resolvedPath += lineNumber ;
117
+ resolvedPath += ':' + lineNumber ;
118
118
}
119
119
resolvedFiles . push ( resolvedPath ) ;
120
120
}
You can’t perform that action at this time.
0 commit comments