Fix tests under IE

kpdecker · kpdecker · commit 861d6f7b8d81 · 2015-09-23T21:59:58.000-05:00
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');
       }
     };
 

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,12 @@ global.shouldThrow = function(callback, type, msg) {`
`61`	`61`	`try {`
`62`	`62`	`callback();`
`63`	`63`	`failed = true;`
`64`		`- } catch (err) {`
`65`		`- if (type && !(err instanceof type)) {`
`66`		`- throw new AssertError('Type failure: ' + err);`
	`64`	`+ } catch (caught) {`
	`65`	`+ if (type && !(caught instanceof type)) {`
	`66`	`+ throw new AssertError('Type failure: ' + caught);`
`67`	`67`	`}`
`68`		`- if (msg && !(msg.test ? msg.test(err.message) : msg === err.message)) {`
`69`		`- throw new AssertError('Throw mismatch: Expected ' + err.message + ' to match ' + msg + '\n\n' + err.stack, shouldThrow);`
	`68`	`+ if (msg && !(msg.test ? msg.test(caught.message) : msg === caught.message)) {`
	`69`	`+ throw new AssertError('Throw mismatch: Expected ' + caught.message + ' to match ' + msg + '\n\n' + caught.stack, shouldThrow);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`if (failed) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<!doctype html>`
`1`	`2`	`<html>`
`2`	`3`	`<head>`
`3`	`4`	`<title>Mocha</title>`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ describe('Regressions', function() {`
`215`	`215`	`return 'found';`
`216`	`216`	`}`
`217`	`217`	`}`
`218`		`- return 'not';`
	`218`	`+ // And to make IE happy, check for the known string as length is not enumerated.`
	`219`	`+ return (this == 'bat' ? 'found' : 'not');`
`219`	`220`	`}`
`220`	`221`	`};`
`221`	`222`