Merge branch 'core-js' into 2.0.0

Conflicts:
	lib/6to5/polyfill.js
This commit is contained in:
Sebastian McKenzie
2014-12-25 14:27:29 +11:00
4 changed files with 9 additions and 62 deletions

View File

@@ -7,6 +7,8 @@ var chai = require("chai");
var util = require("../lib/6to5/util");
var _ = require("lodash");
require("../lib/6to5/polyfill");
var run = function (task, done) {
var actual = task.actual;
var expect = task.expect;
@@ -26,8 +28,6 @@ var run = function (task, done) {
result = transform(execCode, getOpts(exec));
execCode = result.code;
require("../lib/6to5/polyfill");
try {
var fn = new Function("assert", "done", "genHelpers", execCode);
fn(assert, done, genHelpers);