Fix tests under IE

handlebars-lang · Sep 24, 2015 · 861d6f7 · 861d6f7
1 parent fffb5a9
commit 861d6f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/lib/handlebars/logger.js b/lib/handlebars/logger.js
@@ -1,11 +1,13 @@
+import {indexOf} from './utils';
+
 let logger = {
   methodMap: ['debug', 'info', 'warn', 'error'],
   level: 'info',
 
   // Maps a given level value to the `methodMap` indexes above.
   lookupLevel: function(level) {
     if (typeof level === 'string') {
-      let levelMap = logger.methodMap.indexOf(level.toLowerCase());
+      let levelMap = indexOf(logger.methodMap, level.toLowerCase());
       if (levelMap >= 0) {
         level = levelMap;
       } else {

diff --git a/spec/env/common.js b/spec/env/common.js
@@ -61,12 +61,12 @@ global.shouldThrow = function(callback, type, msg) {
   try {
     callback();
     failed = true;
-  } catch (err) {
-    if (type && !(err instanceof type)) {
-      throw new AssertError('Type failure: ' + err);
+  } catch (caught) {
+    if (type && !(caught instanceof type)) {
+      throw new AssertError('Type failure: ' + caught);
     }
-    if (msg && !(msg.test ? msg.test(err.message) : msg === err.message)) {
-      throw new AssertError('Throw mismatch: Expected ' + err.message + ' to match ' + msg + '\n\n' + err.stack, shouldThrow);
+    if (msg && !(msg.test ? msg.test(caught.message) : msg === caught.message)) {
+      throw new AssertError('Throw mismatch: Expected ' + caught.message + ' to match ' + msg + '\n\n' + caught.stack, shouldThrow);
     }
   }
   if (failed) {

diff --git a/spec/index.html b/spec/index.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
   <head>
     <title>Mocha</title>

diff --git a/spec/regressions.js b/spec/regressions.js
@@ -215,7 +215,8 @@ describe('Regressions', function() {
             return 'found';
           }
         }
-        return 'not';
+        // And to make IE happy, check for the known string as length is not enumerated.
+        return (this == 'bat' ? 'found' : 'not');
       }
     };