ember-source 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68ce8c8e4dc0019a91e79c0ceff1e960dde7cd40
-  data.tar.gz: f1b6e43433ad617b754ef92ec97c3becc9c7f014
+  metadata.gz: b16a33ee5f7d098c3645827fa1b883ada71366c0
+  data.tar.gz: 7c5fef9ae81fe0844c89874d17f84398559d870b
 SHA512:
-  metadata.gz: 6c918303349659168e0a015a59a3aa2caa11b9791dc7892a3027631f1e222f313dceb49ca1c0ae466463a66b55e61f3e4e9f857f04821e3b54fe0d9ea5de89c2
-  data.tar.gz: ff7666431e55c0892fbc57838560f540d0f3efc4db27021d7f3b4d6d3ec147411be049d57989909bdd3cb0ab25693ce8e047c766578adbdde9b56459c62b8000
+  metadata.gz: dedf4b44506283b10c9bdfe18b1fa49aeb1928d04e1c9fc17e81252934d6c6cefcad70a1ead868aca3f1bf30c2d67ebd63aae611dff37e1f5ddae67ff41e886d
+  data.tar.gz: e6d1ac559afab94d902c80749369779424d89a71703d68bd98a01ad8454df162f5dd9b7992c41a9f9483178c340d9ba4c26d7ec902c241eddcdf778eae2d029c

data/VERSION

@@ -1 +1 @@
-2.15.0
+2.15.1

data/dist/ember-runtime.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.15.0
+ * @version   2.15.1
  */
 
 var enifed, requireModule, Ember;
@@ -5361,6 +5361,12 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   };
 
   var onerror = void 0;
+  var onErrorTarget = {
+    get onerror() {
+      return dispatchOverride || onerror;
+    }
+  };
+
   // Ember.onerror getter
   function getOnerror() {
     return onerror;
@@ -5680,15 +5686,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     run$1.currentRunLoop = next;
   }
 
-  var onErrorTarget = {
-    get onerror() {
-      return dispatchError;
-    },
-    set onerror(handler) {
-      return setOnerror(handler);
-    }
-  };
-
   var backburner = new Backburner(['sync', 'actions', 'destroy'], {
     GUID_KEY: emberUtils.GUID_KEY,
     sync: {

data/dist/ember-template-compiler.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.15.0
+ * @version   2.15.1
  */
 
 var enifed, requireModule, Ember;
@@ -4640,7 +4640,6 @@ enifed('backburner', ['exports'], function (exports) {
             this.name = name;
             this.options = options;
             this.globalOptions = globalOptions;
-            this.globalOptions.onError = getOnError(globalOptions);
         }
 
         Queue.prototype.push = function (target, method, args, stack) {
@@ -4670,14 +4669,13 @@ enifed('backburner', ['exports'], function (exports) {
             var _options = this.options,
                 before = _options.before,
                 after = _options.after,
+                onError,
                 i;
 
             var target = void 0;
             var method = void 0;
             var args = void 0;
             var errorRecordedForStack = void 0;
-            var onError = this.globalOptions.onError;
-            var invoke = onError ? this.invokeWithOnError : this.invoke;
             this.targetQueues = Object.create(null);
             var queueItems = void 0;
             if (this._queueBeingFlushed.length > 0) {
@@ -4689,33 +4687,39 @@ enifed('backburner', ['exports'], function (exports) {
             if (before) {
                 before();
             }
-            for (i = this.index; i < queueItems.length; i += 4) {
-                this.index += 4;
-                target = queueItems[i];
-                method = queueItems[i + 1];
-                args = queueItems[i + 2];
-                errorRecordedForStack = queueItems[i + 3]; // Debugging assistance
-                // method could have been nullified / canceled during flush
-                if (method !== null) {
-                    //
-                    //    ** Attention intrepid developer **
-                    //
-                    //    To find out the stack of this task when it was scheduled onto
-                    //    the run loop, add the following to your app.js:
-                    //
-                    //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
-                    //
-                    //    Once that is in place, when you are at a breakpoint and navigate
-                    //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
-                    //    which will be the captured stack when this job was scheduled.
-                    //
-                    //    One possible long-term solution is the following Chrome issue:
-                    //       https://bugs.chromium.org/p/chromium/issues/detail?id=332624
-                    //
-                    invoke(target, method, args, onError, errorRecordedForStack);
-                }
-                if (this.index !== this._queueBeingFlushed.length && this.globalOptions.mustYield && this.globalOptions.mustYield()) {
-                    return 1 /* Pause */;
+            var invoke = void 0;
+            if (queueItems.length > 0) {
+                onError = getOnError(this.globalOptions);
+
+                invoke = onError ? this.invokeWithOnError : this.invoke;
+                for (i = this.index; i < queueItems.length; i += 4) {
+                    this.index += 4;
+                    target = queueItems[i];
+                    method = queueItems[i + 1];
+                    args = queueItems[i + 2];
+                    errorRecordedForStack = queueItems[i + 3]; // Debugging assistance
+                    // method could have been nullified / canceled during flush
+                    if (method !== null) {
+                        //
+                        //    ** Attention intrepid developer **
+                        //
+                        //    To find out the stack of this task when it was scheduled onto
+                        //    the run loop, add the following to your app.js:
+                        //
+                        //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
+                        //
+                        //    Once that is in place, when you are at a breakpoint and navigate
+                        //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
+                        //    which will be the captured stack when this job was scheduled.
+                        //
+                        //    One possible long-term solution is the following Chrome issue:
+                        //       https://bugs.chromium.org/p/chromium/issues/detail?id=332624
+                        //
+                        invoke(target, method, args, onError, errorRecordedForStack);
+                    }
+                    if (this.index !== this._queueBeingFlushed.length && this.globalOptions.mustYield && this.globalOptions.mustYield()) {
+                        return 1 /* Pause */;
+                    }
                 }
             }
             if (after) {
@@ -4926,7 +4930,6 @@ enifed('backburner', ['exports'], function (exports) {
 
     // accepts a function that when invoked will return an iterator
     // iterator will drain until completion
-    // accepts a function that when invoked will return an iterator
     var iteratorDrain = function (fn) {
         var iterator = fn();
         var result = iterator.next();
@@ -4936,7 +4939,6 @@ enifed('backburner', ['exports'], function (exports) {
         }
     };
 
-    var now = Date.now;
     var noop = function () {};
 
     var Backburner = function () {
@@ -4977,6 +4979,9 @@ enifed('backburner', ['exports'], function (exports) {
                 return platform.setTimeout(fn, 0);
             };
             platform.clearNext = _platform.clearNext || platform.clearTimeout;
+            platform.now = _platform.now || function () {
+                return Date.now();
+            };
             this._platform = platform;
             this._boundRunExpiredTimers = function () {
                 _this._runExpiredTimers();
@@ -5275,7 +5280,7 @@ enifed('backburner', ['exports'], function (exports) {
                 }
             }
             var onError = getOnError(this.options);
-            var executeAt = now() + wait;
+            var executeAt = this._platform.now() + wait;
             var fn = void 0;
             if (onError) {
                 fn = function () {
@@ -5495,7 +5500,7 @@ enifed('backburner', ['exports'], function (exports) {
             var l = timers.length;
             var i = 0;
             var defaultQueue = this.options.defaultQueue;
-            var n = now();
+            var n = this._platform.now();
             for (; i < l; i += 2) {
                 executeAt = timers[i];
 
@@ -5529,7 +5534,7 @@ enifed('backburner', ['exports'], function (exports) {
                 return;
             }
             var minExpiresAt = this._timers[0];
-            var n = now();
+            var n = this._platform.now();
             var wait = Math.max(0, minExpiresAt - n);
             this._timerTimeoutId = this._platform.setTimeout(this._boundRunExpiredTimers, wait);
         };
@@ -11519,22 +11524,20 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   };
 
   var onerror = void 0;
+  var onErrorTarget = {
+    get onerror() {
+      return dispatchOverride || onerror;
+    }
+  };
+
   // Ember.onerror getter
 
   // Ember.onerror setter
-  function setOnerror(handler) {
-    onerror = handler;
-  }
+
 
   var dispatchOverride = void 0;
   // dispatch error
-  function dispatchError(error) {
-    if (dispatchOverride) {
-      dispatchOverride(error);
-    } else {
-      defaultDispatch(error);
-    }
-  }
+
 
   // allows testing adapter to override dispatch
 
@@ -11828,15 +11831,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   */
 
 
-  var onErrorTarget = {
-    get onerror() {
-      return dispatchError;
-    },
-    set onerror(handler) {
-      return setOnerror(handler);
-    }
-  };
-
   var backburner = new Backburner(['sync', 'actions', 'destroy'], {
     GUID_KEY: emberUtils.GUID_KEY,
     sync: {
@@ -14727,8 +14721,16 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.getOnerror = function () {
     return onerror;
   };
-  exports.setOnerror = setOnerror;
-  exports.dispatchError = dispatchError;
+  exports.setOnerror = function (handler) {
+    onerror = handler;
+  };
+  exports.dispatchError = function (error) {
+    if (dispatchOverride) {
+      dispatchOverride(error);
+    } else {
+      defaultDispatch(error);
+    }
+  };
   exports.setDispatchOverride = function (handler) {
     dispatchOverride = handler;
   };
@@ -17143,7 +17145,7 @@ enifed('ember/features', ['exports', 'ember-environment', 'ember-utils'], functi
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.15.0";
+  exports.default = "2.15.1";
 });
 enifed("handlebars", ["exports"], function (exports) {
   "use strict";

data/dist/ember-testing.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.15.0
+ * @version   2.15.1
  */
 
 var enifed, requireModule, Ember;

data/dist/ember-tests.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.15.0
+ * @version   2.15.1
  */
 
 var enifed, requireModule, Ember;
@@ -8616,7 +8616,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this12.assertText('Application');
         return _this12.transitionTo('blog.post');
-      }).catch(function () {
+      }).then(function () {
         _this12.assertText('ApplicationError! Oh, noes!');
       });
     };
@@ -8639,7 +8639,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this13.assertText('Application');
         return _this13.transitionTo('blog.post');
-      }).catch(function () {
+      }).then(function () {
         _this13.assertText('ApplicationEngineError! Oh, noes!');
       });
     };
@@ -8662,7 +8662,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this14.assertText('Application');
         return _this14.transitionTo('blog.post');
-      }).catch(function () {
+      }).then(function () {
         _this14.assertText('ApplicationEngineError! Oh, noes!');
       });
     };
@@ -8685,7 +8685,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this15.assertText('Application');
         return _this15.transitionTo('blog.post.comments');
-      }).catch(function () {
+      }).then(function () {
         _this15.assertText('ApplicationEngineError! Oh, noes!');
       });
     };
@@ -45221,7 +45221,7 @@ QUnit.test('should pass ESLint', function(assert) {
   assert.ok(true, 'ember-metal/tests/run_loop/debounce_test.js should pass ESLint\n\n');
 });
 
-enifed('ember-metal/tests/run_loop/later_test', ['ember-metal'], function (_emberMetal) {
+enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'], function (_emberUtils, _emberMetal) {
   'use strict';
 
   var originalSetTimeout = window.setTimeout;
@@ -45428,7 +45428,7 @@ enifed('ember-metal/tests/run_loop/later_test', ['ember-metal'], function (_embe
     // happens when an expired timer callback takes a while to run,
     // which is what we simulate here.
     var newSetTimeoutUsed = void 0;
-    _emberMetal.run.backburner._platform = {
+    _emberMetal.run.backburner._platform = (0, _emberUtils.assign)({}, originalPlatform, {
       setTimeout: function () {
         var wait = arguments[arguments.length - 1];
         newSetTimeoutUsed = true;
@@ -45436,7 +45436,7 @@ enifed('ember-metal/tests/run_loop/later_test', ['ember-metal'], function (_embe
 
         return originalPlatform.setTimeout.apply(originalPlatform, arguments);
       }
-    };
+    });
 
     var count = 0;
     (0, _emberMetal.run)(function () {
@@ -67228,6 +67228,105 @@ QUnit.test('should pass ESLint', function(assert) {
   assert.ok(true, 'ember/tests/controller_test.js should pass ESLint\n\n');
 });
 
+enifed('ember/tests/error_handler_test', ['ember', 'ember-metal'], function (_ember, _emberMetal) {
+  'use strict';
+
+  var ONERROR = _ember.default.onerror;
+  var ADAPTER = _ember.default.Test && _ember.default.Test.adapter;
+  var TESTING = _ember.default.testing;
+
+  QUnit.module('error_handler', {
+    teardown: function () {
+      _ember.default.onerror = ONERROR;
+      _ember.default.testing = TESTING;
+      if (_ember.default.Test) {
+        _ember.default.Test.adapter = ADAPTER;
+      }
+    }
+  });
+
+  function runThatThrows(message) {
+    return (0, _emberMetal.run)(function () {
+      throw new Error(message);
+    });
+  }
+
+  test('by default there is no onerror', function (assert) {
+    _ember.default.onerror = undefined;
+    assert.throws(runThatThrows, Error);
+    assert.equal(_ember.default.onerror, undefined);
+  });
+
+  test('when Ember.onerror is registered', function (assert) {
+    assert.expect(2);
+    _ember.default.onerror = function (error) {
+      assert.ok(true, 'onerror called');
+      throw error;
+    };
+    assert.throws(runThatThrows, Error);
+    // Ember.onerror = ONERROR;
+  });
+
+  if (true) {
+    test('when Ember.Test.adapter is registered', function (assert) {
+      assert.expect(2);
+
+      _ember.default.Test.adapter = {
+        exception: function (error) {
+          assert.ok(true, 'adapter called');
+          throw error;
+        }
+      };
+
+      assert.throws(runThatThrows, Error);
+    });
+
+    test('when both Ember.onerror Ember.Test.adapter are registered', function (assert) {
+      assert.expect(2);
+
+      // takes precedence
+      _ember.default.Test.adapter = {
+        exception: function (error) {
+          assert.ok(true, 'adapter called');
+          throw error;
+        }
+      };
+
+      _ember.default.onerror = function (error) {
+        assert.ok(false, 'onerror was NEVER called');
+        throw error;
+      };
+
+      assert.throws(runThatThrows, Error);
+    });
+  }
+
+  QUnit.test('Ember.run does not swallow exceptions by default (Ember.testing = true)', function () {
+    _ember.default.testing = true;
+    var error = new Error('the error');
+    throws(function () {
+      _ember.default.run(function () {
+        throw error;
+      });
+    }, error);
+  });
+
+  QUnit.test('Ember.run does not swallow exceptions by default (Ember.testing = false)', function () {
+    _ember.default.testing = false;
+    var error = new Error('the error');
+    throws(function () {
+      _ember.default.run(function () {
+        throw error;
+      });
+    }, error);
+  });
+});
+QUnit.module('ESLint | ember/tests/error_handler_test.js');
+QUnit.test('should pass ESLint', function(assert) {
+  assert.expect(1);
+  assert.ok(true, 'ember/tests/error_handler_test.js should pass ESLint\n\n');
+});
+
 enifed('ember/tests/global-api-test', ['ember-metal', 'ember-runtime'], function (_emberMetal, _emberRuntime) {
   'use strict';
 
@@ -72818,9 +72917,7 @@ enifed('ember/tests/routing/basic_test', ['ember-utils', 'ember-console', 'ember
       }
     });
 
-    throws(function () {
-      return bootApplication();
-    }, /More context objects were passed/);
+    bootApplication();
 
     equal((0, _emberViews.jQuery)('#error').length, 1, 'Error template was rendered.');
   });
@@ -77990,7 +78087,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Default error event moves into nested route', function () {
-    expect(6);
+    expect(5);
 
     templates['grandma'] = 'GRANDMA {{outlet}}';
     templates['grandma/error'] = 'ERROR: {{model.msg}}';
@@ -78022,11 +78119,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    throws(function () {
-      bootApplication('/grandma/mom/sally');
-    }, function (err) {
-      return err.msg === 'did it broke?';
-    });
+    bootApplication('/grandma/mom/sally');
 
     step(3, 'App finished booting');
 
@@ -78410,7 +78503,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Default error event moves into nested route, prioritizing more specifically named error route', function () {
-    expect(6);
+    expect(5);
 
     templates['grandma'] = 'GRANDMA {{outlet}}';
     templates['grandma/error'] = 'ERROR: {{model.msg}}';
@@ -78443,11 +78536,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    throws(function () {
-      bootApplication('/grandma/mom/sally');
-    }, function (err) {
-      return err.msg === 'did it broke?';
-    });
+    bootApplication('/grandma/mom/sally');
 
     step(3, 'App finished booting');
 
@@ -78548,7 +78637,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Prioritized error substate entry works with preserved-namespace nested routes', function () {
-    expect(2);
+    expect(1);
 
     templates['foo/bar_error'] = 'FOOBAR ERROR: {{model.msg}}';
     templates['foo/bar'] = 'YAY';
@@ -78569,11 +78658,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    throws(function () {
-      bootApplication('/foo/bar');
-    }, function (err) {
-      return err.msg === 'did it broke?';
-    });
+    bootApplication('/foo/bar');
 
     equal((0, _emberViews.jQuery)('#app', '#qunit-fixture').text(), 'FOOBAR ERROR: did it broke?', 'foo.bar_error was entered (as opposed to something like foo/foo/bar_error)');
   });
@@ -78615,7 +78700,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Prioritized error substate entry works with auto-generated index routes', function () {
-    expect(2);
+    expect(1);
 
     templates['foo/index_error'] = 'FOO ERROR: {{model.msg}}';
     templates['foo/index'] = 'YAY';
@@ -78642,17 +78727,13 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    throws(function () {
-      return bootApplication('/foo');
-    }, function (err) {
-      return err.msg === 'did it broke?';
-    });
+    bootApplication('/foo');
 
     equal((0, _emberViews.jQuery)('#app', '#qunit-fixture').text(), 'FOO ERROR: did it broke?', 'foo.index_error was entered');
   });
 
   QUnit.test('Rejected promises returned from ApplicationRoute transition into top-level application_error', function () {
-    expect(3);
+    expect(2);
 
     templates['application_error'] = '<p id="toplevel-error">TOPLEVEL ERROR: {{model.msg}}</p>';
 
@@ -78667,11 +78748,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    throws(function () {
-      return bootApplication();
-    }, function (err) {
-      return err.msg === 'BAD NEWS BEARS';
-    });
+    bootApplication();
 
     equal((0, _emberViews.jQuery)('#toplevel-error', '#qunit-fixture').text(), 'TOPLEVEL ERROR: BAD NEWS BEARS');