From b337c1ab065c3ac9c5a6c5a6f11f9c7e0eec0992 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Sun, 16 Nov 2014 14:32:40 +1100 Subject: [PATCH] test/transformation: use full location as `filename` --- test/_helper.js | 4 ++-- test/transformation.js | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/test/_helper.js b/test/_helper.js index 9325bc011b..72f38142e6 100644 --- a/test/_helper.js +++ b/test/_helper.js @@ -48,8 +48,8 @@ exports.get = function (entryName) { var execLoc = taskDir + "/exec.js"; var taskOpts = _.merge({ - filename: actualLocAlias, - sourceMapName: expectLocAlias + sourceFileName: actualLocAlias, + sourceMapName: expectLocAlias }, _.cloneDeep(suite.options)); var taskOptsLoc = taskDir + "/options.json"; diff --git a/test/transformation.js b/test/transformation.js index 6f73359e92..132c23712e 100644 --- a/test/transformation.js +++ b/test/transformation.js @@ -9,21 +9,20 @@ var _ = require("lodash"); var run = function (task) { var actual = task.actual; var expect = task.expect; - var opts = task.options; var exec = task.exec; - var getOpts = function (filename) { + var getOpts = function (self) { return _.merge({ whtiespace: true, - filename: filename - }, opts); + filename: self.loc + }, task.options); }; var execCode = exec.code; var result; if (execCode) { - result = transform(execCode, getOpts(exec.filename)); + result = transform(execCode, getOpts(exec)); execCode = result.code; require("../lib/6to5/polyfill"); @@ -39,7 +38,7 @@ var run = function (task) { var actualCode = actual.code; var expectCode = expect.code; - result = transform(actualCode, getOpts(actual.filename)); + result = transform(actualCode, getOpts(actual)); actualCode = result.code; chai.expect(actualCode).to.be.equal(expectCode, actual.loc + " !== " + expect.loc);