ie test fixes

systemjs · Aug 9, 2015 · e7ac0cc · e7ac0cc
1 parent 4a945d7
commit e7ac0cc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -188,7 +188,7 @@ SystemJSLoader.prototype.config = function(cfg) {
 
       this.packages[prop]= this.packages[prop] || {};
       for (var q in cfg.packages[p]) {
-        if (packageProperties.indexOf(q) == -1 && typeof console != 'undefined' && console.warn)
+        if (indexOf.call(packageProperties, q) == -1 && typeof console != 'undefined' && console.warn)
           console.warn('"' + q + '" is not a valid package configuration option in package ' + p);
         this.packages[prop][q] = cfg.packages[p][q];
       }

diff --git a/lib/meta.js b/lib/meta.js
@@ -62,7 +62,7 @@
       var bestDepth = 0;
       var wildcardIndex;
       for (var module in meta) {
-        wildcardIndex = indexOf.call(module, '*');
+        wildcardIndex = module.indexOf('*');
         if (wildcardIndex === -1)
           continue;
         if (module.substr(0, wildcardIndex) === name.substr(0, wildcardIndex)

diff --git a/test/test.js b/test/test.js
@@ -558,9 +558,7 @@ asyncTest('Loading dynamic modules with __esModule flag set', function() {
   }, err);
 });
 
-if (ie8)
-  return;
-
+if (!ie8) {
 asyncTest('ES6 named export loading of CJS', function() {
   System['import']('tests/es-named-import-cjs.js').then(function(m) {
     ok(m.cjsFuncValue === 'named export');
@@ -779,6 +777,7 @@ asyncTest('Loading two bundles that have a shared dependency', function() {
     }, err);
   }, err);
 });
+}
 
 asyncTest("System clone", function() {
   var clonedSystem = new System.constructor();
@@ -821,7 +820,7 @@ asyncTest("Duplicate entries", function() {
 });
 
 // new features!!
-
+if (!ie8)
 asyncTest('Named imports for non-es6', function() {
   System['import']('tests/es6-cjs-named-export.js').then(function(m) {
     ok(m.someExport == 'asdf');
@@ -854,6 +853,7 @@ asyncTest('Multi-format deps meta', function() {
   }, err);
 });
 
+
 asyncTest('Wildcard meta', function() {
   System.config({
     meta: {
@@ -914,6 +914,7 @@ asyncTest('Package configuration CommonJS config example', function() {
   }, err);
 });
 
+if (!ie8)
 asyncTest('Conditional loading', function() {
   System.set('env', System.newModule({ 'browser': 'ie' }));
 
@@ -932,6 +933,7 @@ asyncTest('Boolean conditional false', function() {
   }, err);
 });
 
+if (!ie8)
 asyncTest('Boolean conditional true', function() {
   System.set('env', System.newModule({ 'js': { 'es5': true } }));
 

diff --git a/test/tests/cs-loader.js b/test/tests/cs-loader.js
@@ -1,3 +1,3 @@
-export function translate(load) {
+exports.translate = function translate(load) {
   return load.source.replace(/#/g, '');
 }