Merge branch 'master' into harmony-v3.0.0

2017-05-07 07:18:15 +08:00
parent 73d6438773 2d99d06601
commit b4c18f6b83
83 changed files with 9768 additions and 8722 deletions
--- a/test/mocha/new.js
+++ b/test/mocha/new.js
@@ -34,7 +34,6 @@ describe("New", function() {
        for (var i = 0; i < tests.length; i++) {
            assert.strictEqual(
                uglify.minify(tests[i], {
-                    fromString: true,
                    output: {beautify: true},
                    compress: false,
                    mangle: false
@@ -76,7 +75,6 @@ describe("New", function() {
        for (var i = 0; i < tests.length; i++) {
            assert.strictEqual(
                uglify.minify(tests[i], {
-                    fromString: true,
                    output: {beautify: false},
                    compress: false,
                    mangle: false