From 13990aed90a6ee8629d9e71e30662f078afa7b63 Mon Sep 17 00:00:00 2001 From: pengzhenqing Date: Tue, 11 Oct 2016 13:59:16 +0800 Subject: [PATCH] use exact string matches to test output --- test/mocha/cli.js | 16 ++++++---------- test/mocha/minify.js | 14 +++----------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/test/mocha/cli.js b/test/mocha/cli.js index 1d08972a..bebd4d9d 100644 --- a/test/mocha/cli.js +++ b/test/mocha/cli.js @@ -55,22 +55,18 @@ describe("bin/uglifyjs", function () { exec(command, function (err, stdout) { if (err) throw err; - assert.doesNotThrow(function (){ - var validate_source_map = /\/\/# sourceMappingURL=data:.*base64,(.*)\s*$/; - var base64 = stdout.match(validate_source_map)[1]; - - var buf = new Buffer(base64, 'base64'); - var map = JSON.parse(buf.toString()); - done(); - }); + assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n" + + "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxHQUFJQSxLQUFNLFdBQ04sUUFBU0MsS0FBS0QsS0FDVixNQUFPQSxLQUdYLE1BQU9DIn0=\n"); + done(); }); }); it("should not append source map to output when not using --source-map-inline", function (done) { var command = uglifyjscmd + ' test/input/issue-1323/sample.js'; exec(command, function (err, stdout) { - var validate_source_map = /\/\/# sourceMappingURL=data:.*base64,(.*)\s*$/; - assert.strictEqual(false, validate_source_map.test(stdout)); + if (err) throw err; + + assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n"); done(); }); }); diff --git a/test/mocha/minify.js b/test/mocha/minify.js index 56c4c02a..ce5e8497 100644 --- a/test/mocha/minify.js +++ b/test/mocha/minify.js @@ -83,23 +83,15 @@ describe("minify", function() { sourceMapInline: true }); var code = result.code; - - assert.doesNotThrow(function() { - var validate_source_map = /\/\/# sourceMappingURL=data:.*base64,(.*)\s*$/; - var base64 = code.match(validate_source_map)[1]; - - var buf = new Buffer(base64, 'base64'); - var map = JSON.parse(buf.toString()); - }) + assert.strictEqual(code, "var a=function(n){return n};\n" + + "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIj8iXSwibmFtZXMiOlsiYSIsImZvbyJdLCJtYXBwaW5ncyI6IkFBQUEsR0FBSUEsR0FBSSxTQUFTQyxHQUFPLE1BQU9BIn0="); }); it("should not append source map to output js when sourceMapInline is not enabled", function() { var result = Uglify.minify('var a = function(foo) { return foo; };', { fromString: true }); - var code = result.code; - var validate_source_map = /\/\/# sourceMappingURL=data:.*base64,(.*)\s*$/; - assert.strictEqual(false, validate_source_map.test(code)); + assert.strictEqual(code, "var a=function(n){return n};"); }); }); });