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/object.js
+++ b/test/mocha/object.js
@@ -4,7 +4,7 @@ var assert = require("assert");
 describe("Object", function() {
    it("Should allow objects to have a methodDefinition as property", function() {
        var code = "var a = {test() {return true;}}";
-        assert.equal(Uglify.minify(code, {fromString: true}).code, "var a={test(){return!0}};");
+        assert.equal(Uglify.minify(code).code, "var a={test(){return!0}};");
    });

    it("Should not allow objects to use static keywords like in classes", function() {