6to5 test polishing

Author: guybedford

karma.conf.js

@@ -32,6 +32,8 @@ module.exports = function(config) {
 
   var files = [
     'test/_helper.js',
+    [options['6to5'] ? 'node_modules/regenerator/runtime.js' : ''],
+
     [!options.ie8 ? (!options['6to5'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/6to5/browser.js') : ''],
 
     'dist/es6-module-loader-' + (!options['6to5'] ? 'traceur' : '6to5') + (options.polyfill ? '' : '-sp') + '.src.js',

package.json

@@ -41,7 +41,8 @@
     "karma-mocha-reporter": "^0.3.1",
     "karma-sauce-launcher": "^0.2.10",
     "minimist": "^1.1.0",
-    "mocha": "^2.0.1"
+    "mocha": "^2.0.1",
+    "regenerator": "^0.8.9"
   },
   "keywords": [
     "script",

test/system.spec.js

@@ -375,7 +375,7 @@ describe('System', function () {
     typeof window != 'undefined' && window.Worker,
     'with Web Worker', function () {
       it('should loading inside of a Web Worker', function (done) {
-        var worker = new Worker(System.baseURL + 'test/worker/worker.js');
+        var worker = new Worker(System.baseURL + 'test/worker/worker-' + (typeof traceur != 'undefined' ? 'traceur' : '6to5') + '.js');
 
         worker.onmessage = function (e) {
           expect(e.data).to.be.equal('p');

test/test-6to5.html

@@ -7,6 +7,7 @@
 
   <!-- set this to the path to 6to5.js -->
   <script src="../node_modules/6to5/browser.js"></script>
+  <script src="../node_modules/regenerator/runtime.js"></script>
 
   <script>
     // test promise polyfill

test/test.js

@@ -607,7 +607,7 @@ function runTests() {
 
   if (Worker)
   test('Loading inside of a Web Worker', function(assert) {
-    var worker = new Worker('worker/worker.js');
+    var worker = new Worker('worker/worker-' + (typeof traceur != 'undefined' ? 'traceur' : '6to5') + '.js');
 
     worker.onmessage = function(e) {
       assert(e.data, 'p');

test/worker/worker-6to5.js

@@ -0,0 +1,9 @@
+importScripts("../../node_modules/6to5/browser.js",
+             "../../node_modules/when/es6-shim/Promise.js",
+             "../../dist/es6-module-loader-6to5.js");
+
+System['import']('es6').then(function(m) {
+  postMessage(m.p);
+}, function(err) {
+  console.error(err, err.stack);
+});

test/worker/worker.js renamed to test/worker/worker-traceur.js

@@ -1,6 +1,6 @@
 importScripts("../../node_modules/traceur/bin/traceur.js",
              "../../node_modules/when/es6-shim/Promise.js",
-             "../../dist/es6-module-loader.js");
+             "../../dist/es6-module-loader-traceur.js");
 
 System['import']('es6').then(function(m) {
   postMessage(m.p);