diff options
| author | kpdecker <kpdecker@gmail.com> | 2015-09-23 21:59:49 -0500 |
|---|---|---|
| committer | kpdecker <kpdecker@gmail.com> | 2015-09-23 21:59:58 -0500 |
| commit | 861d6f7b8d8149657c5396ed6b2e2930294edd4e (patch) | |
| tree | 3917ebbcec2ea63867e0484dbf10c3a7ca2cb2ea | |
| parent | fffb5a985f8ff7cd75f2c16b37b69f7ddd3ba9a0 (diff) | |
| download | handlebars.js-861d6f7b8d8149657c5396ed6b2e2930294edd4e.zip handlebars.js-861d6f7b8d8149657c5396ed6b2e2930294edd4e.tar.gz handlebars.js-861d6f7b8d8149657c5396ed6b2e2930294edd4e.tar.bz2 | |
Fix tests under IE
| -rw-r--r-- | lib/handlebars/logger.js | 4 | ||||
| -rw-r--r-- | spec/env/common.js | 10 | ||||
| -rw-r--r-- | spec/index.html | 1 | ||||
| -rw-r--r-- | spec/regressions.js | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/lib/handlebars/logger.js b/lib/handlebars/logger.js index 1d583dd..1ab0051 100644 --- a/lib/handlebars/logger.js +++ b/lib/handlebars/logger.js @@ -1,3 +1,5 @@ +import {indexOf} from './utils'; + let logger = { methodMap: ['debug', 'info', 'warn', 'error'], level: 'info', @@ -5,7 +7,7 @@ let logger = { // 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 index 2a24db2..e378052 100644 --- 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 index 348ae89..5db2146 100644 --- 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 index 931fc4b..bd0a111 100644 --- 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'); } }; |