Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(testrunner): better capture Location for hooks (#1680)

Browse source
This commit is contained in:
Dmitry Gozman 2020-04-06 17:47:17 -07:00 committed by GitHub
parent f2b13c0e93
commit e519a3d762
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/testrunner/Location.js
View file

@ -49,9 +49,7 @@ class Location {
return this._fileName + ':' + this._lineNumber + ':' + this._columnNumber; return this._fileName + ':' + this._lineNumber + ':' + this._columnNumber;
} }
// TODO: static getCallerLocationIn(glob) vs getCallerLocationIgnoring(glob). static getCallerLocation(ignorePrefix = __dirname) {
static getCallerLocation(filename) {
const error = new Error(); const error = new Error();
const stackFrames = error.stack.split('\n').slice(1); const stackFrames = error.stack.split('\n').slice(1);
const location = new Location(); const location = new Location();
@ -71,7 +69,7 @@ class Location {
if (!match) if (!match)
return null; return null;
const filePath = match[1]; const filePath = match[1];
if (filePath === __filename || filePath === filename) if (filePath === __filename || filePath.startsWith(ignorePrefix))
continue; continue;
location._filePath = filePath; location._filePath = filePath;

2
utils/testrunner/Matchers.js
View file

@ -40,7 +40,7 @@ class MatchError extends Error {
super(message); super(message);
this.name = this.constructor.name; this.name = this.constructor.name;
this.formatter = formatter; this.formatter = formatter;
this.location = Location.getCallerLocation(__filename); this.location = Location.getCallerLocation();
Error.captureStackTrace(this, this.constructor); Error.captureStackTrace(this, this.constructor);
} }
} }

2
utils/testrunner/Test.js
View file

@ -23,7 +23,7 @@ const TestExpectation = {
}; };
function createHook(callback, name) { function createHook(callback, name) {
const location = Location.getCallerLocation(__filename); const location = Location.getCallerLocation();
return { name, body: callback, location }; return { name, body: callback, location };
} }

4
utils/testrunner/TestCollector.js
View file

@ -136,7 +136,7 @@ class TestCollector {
this._currentSuite = new Suite(null, '', new Location()); this._currentSuite = new Suite(null, '', new Location());
this._api.describe = specBuilder(this._suiteModifiers, this._suiteAttributes, (specs, name, suiteCallback, ...suiteArgs) => { this._api.describe = specBuilder(this._suiteModifiers, this._suiteAttributes, (specs, name, suiteCallback, ...suiteArgs) => {
const location = Location.getCallerLocation(__filename); const location = Location.getCallerLocation();
const suite = new Suite(this._currentSuite, name, location); const suite = new Suite(this._currentSuite, name, location);
for (const { callback, args } of specs) for (const { callback, args } of specs)
callback(suite, ...args); callback(suite, ...args);
@ -146,7 +146,7 @@ class TestCollector {
this._currentSuite = suite.parentSuite(); this._currentSuite = suite.parentSuite();
}); });
this._api.it = specBuilder(this._testModifiers, this._testAttributes, (specs, name, testCallback) => { this._api.it = specBuilder(this._testModifiers, this._testAttributes, (specs, name, testCallback) => {
const location = Location.getCallerLocation(__filename); const location = Location.getCallerLocation();
const test = new Test(this._currentSuite, name, testCallback, location); const test = new Test(this._currentSuite, name, testCallback, location);
test.setTimeout(timeout); test.setTimeout(timeout);
for (const { callback, args } of specs) for (const { callback, args } of specs)