Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit 039ffa7

Browse files
committed
fix(configParser): Remove path.parse so protractor works with node < v0.12
Closes #2588
1 parent c808741 commit 039ffa7

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: node_js
22
sudo: false
33
node_js:
4+
- "0.10"
45
- "0.12"
56
- "4"
67

@@ -20,6 +21,8 @@ matrix:
2021
exclude:
2122
- env: JOB=smoke
2223
node_js: "0.12"
24+
- env: JOB=smoke
25+
node_js: "0.10"
2326

2427

2528
before_script:

lib/configParser.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,23 @@ ConfigParser.resolveFilePatterns =
9898
for (var i = 0; i < patterns.length; ++i) {
9999
// Cucumber allows running a spec given a line number. See
100100
// 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});
110110

111111
if (!matches.length && !opt_omitWarnings) {
112112
log.warn('pattern ' + patterns[i] + ' did not match any files.');
113113
}
114114
for (var j = 0; j < matches.length; ++j) {
115115
var resolvedPath = path.resolve(cwd, matches[j]);
116116
if (lineNumber) {
117-
resolvedPath += lineNumber;
117+
resolvedPath += ':' + lineNumber;
118118
}
119119
resolvedFiles.push(resolvedPath);
120120
}

0 commit comments

Comments
 (0)