cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Incorrect trace position in fixture runner (#10566)

Browse Source 
* test: add test case

* fix: incorrect fixture callsite position
This commit is contained in:
Huáng Jùnliàng 2019-12-04 18:35:37 -05:00 committed by Nicolò Ribaudo
parent bb6cc61979
commit e94da0dce5
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/babel-helper-transform-fixture-test-runner/src/index.js
View File

@ -62,11 +62,12 @@ function runModuleInTestContext(id: string, relativeFilename: string) {
const req = id => runModuleInTestContext(id, filename); const req = id => runModuleInTestContext(id, filename);
const src = fs.readFileSync(filename, "utf8"); const src = fs.readFileSync(filename, "utf8");
const code = `(function (exports, require, module, __filename, __dirname) {${src}\n});`; const code = `(function (exports, require, module, __filename, __dirname) {\n${src}\n});`;
vm.runInContext(code, testContext, { vm.runInContext(code, testContext, {
filename, filename,
displayErrors: true, displayErrors: true,
lineOffset: -1,
}).call(module.exports, module.exports, req, module, filename, dirname); }).call(module.exports, module.exports, req, module, filename, dirname);
return module.exports; return module.exports;
@ -94,10 +95,11 @@ export function runCodeInTestContext(code: string, opts: { filename: string }) {
// Expose the test options as "opts", but otherwise run the test in a CommonJS-like environment. // Expose the test options as "opts", but otherwise run the test in a CommonJS-like environment.
// Note: This isn't doing .call(module.exports, ...) because some of our tests currently // Note: This isn't doing .call(module.exports, ...) because some of our tests currently
// rely on 'this === global'. // rely on 'this === global'.
const src = `(function(exports, require, module, __filename, __dirname, opts) {${code}\n});`; const src = `(function(exports, require, module, __filename, __dirname, opts) {\n${code}\n});`;
return vm.runInContext(src, testContext, { return vm.runInContext(src, testContext, {
filename, filename,
displayErrors: true, displayErrors: true,
lineOffset: -1,
})(module.exports, req, module, filename, dirname, opts); })(module.exports, req, module, filename, dirname, opts);
} finally { } finally {
process.chdir(oldCwd); process.chdir(oldCwd);

13
packages/babel-helper-transform-fixture-test-runner/test/index.js
View File

@ -35,4 +35,17 @@ describe("helper-transform-fixture-test-runner", function() {
); );
} }
}); });
it("should print correct trace position when error is thrown in the first line", () => {
const opts = {
filename: `${__filename}.fake4`,
};
runCodeInTestContext(
`try { throw new Error() } catch (e) {
opts.stack = e.stack
}
`,
opts,
);
expect(opts.stack).toContain(opts.filename + ":1:13");
});
}); });