Merge branch 'master' into code-generator
This commit is contained in:
commit
4c63b4ea1e
@ -4,6 +4,7 @@ var rimraf = require("rimraf");
|
|||||||
var mkdirp = require("mkdirp");
|
var mkdirp = require("mkdirp");
|
||||||
var child = require("child_process");
|
var child = require("child_process");
|
||||||
var path = require("path");
|
var path = require("path");
|
||||||
|
var chai = require("chai");
|
||||||
var fs = require("fs");
|
var fs = require("fs");
|
||||||
var _ = require("lodash");
|
var _ = require("lodash");
|
||||||
|
|
||||||
@ -42,7 +43,7 @@ var assertTest = function (stdout, stderr, opts) {
|
|||||||
if (opts.stderrContains) {
|
if (opts.stderrContains) {
|
||||||
assert.ok(_.contains(stderr, expectStderr), "stderr " + JSON.stringify(stderr) + " didn't contain " + JSON.stringify(expectStderr));
|
assert.ok(_.contains(stderr, expectStderr), "stderr " + JSON.stringify(stderr) + " didn't contain " + JSON.stringify(expectStderr));
|
||||||
} else {
|
} else {
|
||||||
assert.equal(stderr, expectStderr, "stderr didn't match");
|
chai.expect(stderr).to.equal(expectStderr, "stderr didn't match");
|
||||||
}
|
}
|
||||||
} else if (stderr) {
|
} else if (stderr) {
|
||||||
throw new Error("stderr: " + JSON.stringify(stderr));
|
throw new Error("stderr: " + JSON.stringify(stderr));
|
||||||
@ -55,7 +56,7 @@ var assertTest = function (stdout, stderr, opts) {
|
|||||||
if (opts.stdoutContains) {
|
if (opts.stdoutContains) {
|
||||||
assert.ok(_.contains(stdout, expectStdout), "stdout " + JSON.stringify(stdout) + " didn't contain " + JSON.stringify(expectStdout));
|
assert.ok(_.contains(stdout, expectStdout), "stdout " + JSON.stringify(stdout) + " didn't contain " + JSON.stringify(expectStdout));
|
||||||
} else {
|
} else {
|
||||||
assert.equal(stdout, expectStdout, "stdout didn't match");
|
chai.expect(stdout).to.equal(expectStdout, "stdout didn't match");
|
||||||
}
|
}
|
||||||
} else if (stdout) {
|
} else if (stdout) {
|
||||||
throw new Error("stdout: " + JSON.stringify(stdout));
|
throw new Error("stdout: " + JSON.stringify(stdout));
|
||||||
@ -63,7 +64,7 @@ var assertTest = function (stdout, stderr, opts) {
|
|||||||
|
|
||||||
_.each(opts.outFiles, function (expect, filename) {
|
_.each(opts.outFiles, function (expect, filename) {
|
||||||
var actual = readFile(filename);
|
var actual = readFile(filename);
|
||||||
assert.equal(actual, expect, "out-file " + filename);
|
chai.expect(actual).to.equal(expect, "out-file " + filename);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -4,8 +4,9 @@ var Test = function() {
|
|||||||
var Test = function Test() {};
|
var Test = function Test() {};
|
||||||
return Test;
|
return Test;
|
||||||
}();
|
}();
|
||||||
|
"use strict";
|
||||||
arr.map(function(x) {
|
arr.map(function(x) {
|
||||||
return x * MULTIPLIER;
|
return x * MULTIPLIER;
|
||||||
});
|
});
|
||||||
|
|
||||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxDQUFDLENBQUMsQ0FBQztNQUFILENBQUMsQ0FBQyxDQUFDLGFBQUgsQ0FBQyxDQUFDLENBQUM7U0FBSCxDQUFDLENBQUMsQ0FBQzs7O0FDQVQsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFDO1NBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQUMsQ0FBQyIsImZpbGUiOiJzY3JpcHQzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiY2xhc3MgVGVzdCB7XG5cbn0iLCJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ==
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxDQUFDLENBQUMsQ0FBQztNQUFILENBQUMsQ0FBQyxDQUFDLGFBQUgsQ0FBQyxDQUFDLENBQUM7U0FBSCxDQUFDLENBQUMsQ0FBQzs7OztBQ0FULENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBQztTQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59IiwiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=
|
||||||
|
|||||||
@ -4,6 +4,7 @@ var Test = function() {
|
|||||||
var Test = function Test() {};
|
var Test = function Test() {};
|
||||||
return Test;
|
return Test;
|
||||||
}();
|
}();
|
||||||
|
"use strict";
|
||||||
arr.map(function(x) {
|
arr.map(function(x) {
|
||||||
return x * MULTIPLIER;
|
return x * MULTIPLIER;
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC;;;ACAT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]}
|
{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC;;;;ACAT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]}
|
||||||
|
|||||||
@ -4,6 +4,7 @@ var Test = function() {
|
|||||||
var Test = function Test() {};
|
var Test = function Test() {};
|
||||||
return Test;
|
return Test;
|
||||||
}();
|
}();
|
||||||
|
"use strict";
|
||||||
arr.map(function(x) {
|
arr.map(function(x) {
|
||||||
return x * MULTIPLIER;
|
return x * MULTIPLIER;
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user