ember-source 1.10.0.beta.4 → 1.10.0

data/dist/ember-testing.js

@@ -5,7 +5,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   1.10.0-beta.4
+ * @version   1.10.0
  */
 
 (function() {
@@ -530,7 +530,7 @@ enifed("ember-testing/helpers",
       var $el = app.testHelpers.findWithAssert(selector, context);
       run($el, 'mousedown');
 
-      if ($el.is(':input')) {
+      if ($el.is(':input, [contenteditable=true]')) {
         var type = $el.prop('type');
         if (type !== 'checkbox' && type !== 'radio' && type !== 'hidden') {
           run($el, function(){
@@ -648,8 +648,10 @@ enifed("ember-testing/helpers",
 
         // Every 10ms, poll for the async thing to have finished
         var watcher = setInterval(function() {
+          var router = app.__container__.lookup('router:main');
+
           // 1. If the router is loading, keep polling
-          var routerIsLoading = !!app.__container__.lookup('router:main').router.activeTransition;
+          var routerIsLoading = router.router && !!router.router.activeTransition;
           if (routerIsLoading) { return; }
 
           // 2. If there are pending Ajax requests, keep polling
@@ -885,6 +887,7 @@ enifed("ember-testing/helpers",
        click('.btn');
        ```
 
+       @since 1.9.0
        @method pauseTest
        @return {Object} A promise that will never resolve
        */
@@ -1055,16 +1058,15 @@ enifed("ember-testing/support",
     });
   });
 enifed("ember-testing/test",
-  ["ember-metal/core","ember-metal/run_loop","ember-metal/platform","ember-runtime/compare","ember-runtime/ext/rsvp","ember-testing/setup_for_testing","ember-application/system/application","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+  ["ember-metal/core","ember-metal/run_loop","ember-metal/platform","ember-runtime/ext/rsvp","ember-testing/setup_for_testing","ember-application/system/application","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var emberRun = __dependency2__["default"];
     var create = __dependency3__.create;
-    var compare = __dependency4__["default"];
-    var RSVP = __dependency5__["default"];
-    var setupForTesting = __dependency6__["default"];
-    var EmberApplication = __dependency7__["default"];
+    var RSVP = __dependency4__["default"];
+    var setupForTesting = __dependency5__["default"];
+    var EmberApplication = __dependency6__["default"];
 
     /**
       @module ember
@@ -1325,15 +1327,13 @@ enifed("ember-testing/test",
          @since 1.2.0
       */
       unregisterWaiter: function(context, callback) {
-        var pair;
         if (!this.waiters) { return; }
         if (arguments.length === 1) {
           callback = context;
           context = null;
         }
-        pair = [context, callback];
         this.waiters = Ember.A(this.waiters.filter(function(elt) {
-          return compare(elt, pair)!==0;
+          return !(elt[0] === context && elt[1] === callback);
         }));
       }
     };

data/dist/ember-tests.js

@@ -5,7 +5,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   1.10.0-beta.4
+ * @version   1.10.0
  */
 
 (function() {
@@ -4034,7 +4034,7 @@ enifed("ember-htmlbars.jshint",
     "use strict";
     module('JSHint - .');
     test('ember-htmlbars.js should pass jshint', function() { 
-      ok(false, 'ember-htmlbars.js should pass jshint.\nember-htmlbars.js: line 26, col 3, \'helper\' is defined but never used.\n\n1 error'); 
+      ok(true, 'ember-htmlbars.js should pass jshint.'); 
     });
   });
 enifed("ember-htmlbars/compat.jshint",
@@ -4073,15 +4073,6 @@ enifed("ember-htmlbars/compat/make-bound-helper.jshint",
       ok(true, 'ember-htmlbars/compat/make-bound-helper.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/compat/precompile.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/compat');
-    test('ember-htmlbars/compat/precompile.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/compat/precompile.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/compat/register-bound-helper.jshint",
   [],
   function() {
@@ -4482,14 +4473,13 @@ enifed("ember-htmlbars/tests/attr_nodes/href_test.jshint",
       ok(true, 'ember-htmlbars/tests/attr_nodes/href_test.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+enifed("ember-htmlbars/tests/attr_nodes/property_test",
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     var EmberView = __dependency1__["default"];
     var run = __dependency2__["default"];
     var compile = __dependency3__["default"];
-    var equalInnerHTML = __dependency4__.equalInnerHTML;
 
     var view;
 
@@ -4505,13 +4495,13 @@ enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test",
     }
 
       });
-enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test.jshint",
+enifed("ember-htmlbars/tests/attr_nodes/property_test.jshint",
   [],
   function() {
     "use strict";
     module('JSHint - ember-htmlbars/tests/attr_nodes');
-    test('ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test.js should pass jshint.'); 
+    test('ember-htmlbars/tests/attr_nodes/property_test.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/tests/attr_nodes/property_test.js should pass jshint.'); 
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/sanitized_test",
@@ -4570,13 +4560,12 @@ enifed("ember-htmlbars/tests/attr_nodes/svg_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/value_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     var EmberView = __dependency1__["default"];
     var run = __dependency2__["default"];
     var compile = __dependency3__["default"];
-    var equalInnerHTML = __dependency4__.equalInnerHTML;
 
     var view;
 
@@ -4857,6 +4846,32 @@ enifed("ember-htmlbars/tests/compat/helper_test",
       runAppend(view);
     });
 
+    test('allows unbound usage within an element', function() {
+      expect(4);
+
+      function someHelper(param1, param2, options) {
+        equal(param1, 'blammo');
+        equal(param2, 'blazzico');
+
+        return "class='foo'";
+      }
+
+      registerHandlebarsCompatibleHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          value: 'foo'
+        },
+        template: compile('<div {{test "blammo" "blazzico"}}>Bar</div>')
+      });
+
+      expectDeprecation(function() {
+        runAppend(view);
+      }, 'Returning a string of attributes from a helper inside an element is deprecated.');
+
+      equal(view.$('.foo').length, 1, 'class attribute was added by helper');
+    });
+
     test('registering a helper created from `Ember.Handlebars.makeViewHelper` does not double wrap the helper', function() {
       expect(1);
 
@@ -4876,6 +4891,111 @@ enifed("ember-htmlbars/tests/compat/helper_test",
       equal(view.$().text(), 'woot!');
     });
 
+    test('does not add `options.fn` if no block was specified', function() {
+      expect(1);
+
+      function someHelper(options) {
+        ok(!options.fn, '`options.fn` is not present when block is not specified');
+      }
+
+      registerHandlebarsCompatibleHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          value: 'foo'
+        },
+        template: compile('{{test}}')
+      });
+
+      runAppend(view);
+    });
+
+    test('does not return helper result if block was specified', function() {
+      expect(1);
+
+      function someHelper(options) {
+        return 'asdf';
+      }
+
+      registerHandlebarsCompatibleHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          value: 'foo'
+        },
+        template: compile('{{#test}}lkj;{{/test}}')
+      });
+
+      runAppend(view);
+
+      equal(view.$().text(), '');
+    });
+
+    test('allows usage of the template fn', function() {
+      expect(1);
+
+      function someHelper(options) {
+        options.fn();
+      }
+
+      registerHandlebarsCompatibleHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          value: 'foo'
+        },
+        template: compile('{{#test}}foo{{/test}}')
+      });
+
+      runAppend(view);
+
+      equal(view.$().text(), 'foo');
+    });
+
+    QUnit.test('ordered param types are added to options.types', function() {
+      expect(3);
+
+      function someHelper(param1, param2, param3, options) {
+        equal(options.types[0], 'NUMBER');
+        equal(options.types[1], 'ID');
+        equal(options.types[2], 'STRING');
+      }
+
+      registerHandlebarsCompatibleHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          first: 'blammo',
+          second: 'blazzico'
+        },
+        template: compile('{{test 1 two "3"}}')
+      });
+
+      runAppend(view);
+    });
+
+    QUnit.test('`hash` params are to options.hashTypes', function() {
+      expect(3);
+
+      function someHelper(options) {
+        equal(options.hashTypes.string, 'STRING');
+        equal(options.hashTypes.number, 'NUMBER');
+        equal(options.hashTypes.id, 'ID');
+      }
+
+      registerHandlebarsCompatibleHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          value: 'Jacquie'
+        },
+        template: compile('{{test string="foo" number=42 id=someBoundThing}}')
+      });
+
+      runAppend(view);
+    });
+
+    // jscs:enable validateIndentation
     
   });
 enifed("ember-htmlbars/tests/compat/helper_test.jshint",
@@ -5585,8 +5705,8 @@ enifed("ember-htmlbars/tests/compat/precompile_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/bind_attr_test",
-  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/namespace","ember-views/views/view","ember-views/views/metamorph_view","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/computed","ember-metal/observer","ember-runtime/system/container","ember-metal/property_set","ember-runtime/tests/utils","htmlbars-test-helpers","ember-htmlbars/helpers","ember-template-compiler/system/compile"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__) {
+  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/namespace","ember-views/views/view","ember-views/views/metamorph_view","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/computed","ember-metal/observer","ember-runtime/system/container","ember-metal/property_set","ember-runtime/tests/utils","ember-htmlbars/helpers","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__) {
     "use strict";
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
@@ -5603,10 +5723,9 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
     var set = __dependency11__.set;
     var runAppend = __dependency12__.runAppend;
     var runDestroy = __dependency12__.runDestroy;
-    var equalInnerHTML = __dependency13__.equalInnerHTML;
 
-    var helpers = __dependency14__["default"];
-    var compile = __dependency15__["default"];
+    var helpers = __dependency13__["default"];
+    var compile = __dependency14__["default"];
     var view;
 
     var originalLookup = Ember.lookup;
@@ -5872,13 +5991,13 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
 
       runAppend(view);
 
-      equalInnerHTML(view.element, '<img class="bar">', 'renders class');
+      equal(view.element.firstChild.className, 'bar', 'renders class');
 
       run(function() {
         set(view, 'foo', 'baz');
       });
 
-      equalInnerHTML(view.element, '<img class="baz">', 'updates rendered class');
+      equal(view.element.firstChild.className, 'baz', 'updates rendered class');
     });
 
     test("should be able to bind unquoted class attribute with {{bind-attr}}", function() {
@@ -5910,13 +6029,13 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
 
       runAppend(view);
 
-      equalInnerHTML(view.element, '<img class="is-truthy">', 'renders class');
+      equal(view.element.firstChild.className, 'is-truthy', 'renders class');
 
       run(function() {
         set(view, 'isNumber', 0);
       });
 
-      equalInnerHTML(view.element.firstChild.className, undefined, 'removes class');
+      ok(view.element.firstChild.className !== 'is-truthy', 'removes class');
     });
 
     test("should be able to bind class to view attribute with {{bind-attr}}", function() {
@@ -9583,6 +9702,9 @@ enifed("ember-htmlbars/tests/helpers/sanitized_bind_attr_test",
       { tag: 'a', attr: 'href',
         template: compile('<a {{bind-attr href=view.badValue}}></a>') },
       { tag: 'body', attr: 'background',
+        // IE8 crashes when setting background with
+        // a javascript: protocol
+        skip: (document.documentMode && document.documentMode <= 8),
         template: compile('<body {{bind-attr background=view.badValue}}></body>') },
       { tag: 'link', attr: 'href',
         template: compile('<link {{bind-attr href=view.badValue}}>') },
@@ -9596,6 +9718,10 @@ enifed("ember-htmlbars/tests/helpers/sanitized_bind_attr_test",
         var attr = badTags[i].attr;
         var template = badTags[i].template;
 
+        if (badTags[i].skip) {
+          return;
+        }
+
         test("XSS - should not bind unsafe "+tagName+" "+attr+" values", function() {
           view = EmberView.create({
             template: template,
@@ -10230,7 +10356,7 @@ enifed("ember-htmlbars/tests/helpers/unbound_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/view_test",
-  ["ember-metal/property_set","ember-views/views/view","container/container","ember-metal/run_loop","ember-views/system/jquery","ember-views/views/text_field","ember-runtime/system/namespace","ember-runtime/system/object","ember-views/views/container_view","ember-views/views/metamorph_view","htmlbars-util/safe-string","ember-htmlbars/compat/precompile","ember-template-compiler/system/compile","ember-template-compiler/system/template","ember-metal/observer","ember-runtime/controllers/object_controller","ember-runtime/tests/utils","ember-metal/property_get","ember-metal/computed"],
+  ["ember-metal/property_set","ember-views/views/view","container/container","ember-metal/run_loop","ember-views/system/jquery","ember-views/views/text_field","ember-runtime/system/namespace","ember-runtime/system/object","ember-views/views/container_view","ember-views/views/metamorph_view","htmlbars-util/safe-string","ember-template-compiler/compat/precompile","ember-template-compiler/system/compile","ember-template-compiler/system/template","ember-metal/observer","ember-runtime/controllers/object_controller","ember-runtime/tests/utils","ember-metal/property_get","ember-metal/computed"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__) {
     "use strict";
     /*globals EmberDev */
@@ -12517,6 +12643,95 @@ enifed("ember-htmlbars/tests/hooks/component_test.jshint",
       ok(true, 'ember-htmlbars/tests/hooks/component_test.js should pass jshint.'); 
     });
   });
+enifed("ember-htmlbars/tests/hooks/element_test",
+  ["ember-views/views/view","ember-htmlbars/helpers","ember-runtime/tests/utils","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+    "use strict";
+    var EmberView = __dependency1__["default"];
+    var helpers = __dependency2__["default"];
+    var registerHelper = __dependency2__.registerHelper;
+    var runAppend = __dependency3__.runAppend;
+    var runDestroy = __dependency3__.runDestroy;
+    var compile = __dependency4__["default"];
+
+    var view;
+
+    QUnit.module('ember-htmlbars: element hook', {
+      teardown: function() {
+        runDestroy(view);
+        delete helpers.test;
+      }
+    });
+
+    test('allows unbound usage within an element', function() {
+      expect(4);
+
+      function someHelper(params, hash, options, env) {
+        equal(params[0], 'blammo');
+        equal(params[1], 'blazzico');
+
+        return "class='foo'";
+      }
+
+      registerHelper('test', someHelper);
+
+      view = EmberView.create({
+        controller: {
+          value: 'foo'
+        },
+        template: compile('<div {{test "blammo" "blazzico"}}>Bar</div>')
+      });
+
+      expectDeprecation(function() {
+        runAppend(view);
+      }, 'Returning a string of attributes from a helper inside an element is deprecated.');
+
+      equal(view.$('.foo').length, 1, 'class attribute was added by helper');
+    });
+
+    test('allows unbound usage within an element from property', function() {
+      expect(2);
+
+      view = EmberView.create({
+        controller: {
+          someProp: 'class="foo"'
+        },
+        template: compile('<div {{someProp}}>Bar</div>')
+      });
+
+      expectDeprecation(function() {
+        runAppend(view);
+      }, 'Returning a string of attributes from a helper inside an element is deprecated.');
+
+      equal(view.$('.foo').length, 1, 'class attribute was added by helper');
+    });
+
+    test('allows unbound usage within an element creating multiple attributes', function() {
+      expect(2);
+
+      view = EmberView.create({
+        controller: {
+          someProp: 'class="foo" data-foo="bar"'
+        },
+        template: compile('<div {{someProp}}>Bar</div>')
+      });
+
+      expectDeprecation(function() {
+        runAppend(view);
+      }, 'Returning a string of attributes from a helper inside an element is deprecated.');
+
+      equal(view.$('.foo[data-foo="bar"]').length, 1, 'attributes added by helper');
+    });
+  });
+enifed("ember-htmlbars/tests/hooks/element_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-htmlbars/tests/hooks');
+    test('ember-htmlbars/tests/hooks/element_test.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/tests/hooks/element_test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-htmlbars/tests/hooks/text_node_test",
   ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-template-compiler/system/compile","htmlbars-test-helpers","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
@@ -12854,7 +13069,18 @@ enifed("ember-htmlbars/tests/integration/block_params_test",
       }
     });
 
-    test("basic block params usage", function() {
+    QUnit.test("should raise error if helper not available", function() {
+      view = View.create({
+        template: compile('{{#shouldfail}}{{/shouldfail}}')
+      });
+
+      expectAssertion(function() {
+        runAppend(view);
+      }, 'A helper named `shouldfail` could not be found');
+
+    });
+
+    QUnit.test("basic block params usage", function() {
       view = View.create({
         committer: { name: "rwjblue" },
         template: compile('{{#alias view.committer.name as |name|}}name: {{name}}, length: {{name.length}}{{/alias}}')
@@ -23342,12 +23568,12 @@ enifed("ember-metal/tests/run_loop/schedule_test",
     test('makes sure it does not trigger an autorun during testing', function() {
       expectAssertion(function() {
         run.schedule('actions', function() {});
-      }, /wrap any code with asynchronous side-effects in an run/);
+      }, /wrap any code with asynchronous side-effects in a run/);
 
       // make sure not just the first violation is asserted.
       expectAssertion(function() {
         run.schedule('actions', function() {});
-      }, /wrap any code with asynchronous side-effects in an run/);
+      }, /wrap any code with asynchronous side-effects in a run/);
     });
   });
 enifed("ember-metal/tests/run_loop/schedule_test.jshint",
@@ -33249,6 +33475,32 @@ enifed("ember-runtime/tests/ext/rsvp_test",
         Ember.testing = wasEmberTesting ;
       }
     });
+
+
+    test('rejections where the errorThrown is a string should wrap the sting in an error object', function() {
+      expect(2);
+
+      var wasEmberTesting = Ember.testing;
+      var wasOnError      = Ember.onerror;
+
+      try {
+        Ember.testing = false;
+        Ember.onerror = function(error) {
+          equal(error.message, actualError, 'expected the real error on the jqXHR');
+          equal(error.__reason_with_error_thrown__, jqXHR, 'also retains a helpful reference to the rejection reason');
+        };
+
+        var actualError = "OMG what really happened";
+        var jqXHR = {
+          errorThrown: actualError
+        };
+
+        run(RSVP, 'reject', jqXHR);
+      } finally {
+        Ember.onerror = wasOnError;
+        Ember.testing = wasEmberTesting;
+      }
+    });
   });
 enifed("ember-runtime/tests/ext/rsvp_test.jshint",
   [],
@@ -46214,6 +46466,24 @@ enifed("ember-template-compiler.jshint",
       ok(true, 'ember-template-compiler.js should pass jshint.'); 
     });
   });
+enifed("ember-template-compiler/compat.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler');
+    test('ember-template-compiler/compat.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/compat.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/compat/precompile.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/compat');
+    test('ember-template-compiler/compat/precompile.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/compat/precompile.js should pass jshint.'); 
+    });
+  });
 enifed("ember-template-compiler/plugins.jshint",
   [],
   function() {
@@ -47160,6 +47430,7 @@ enifed("ember-testing/tests/helpers_test",
         jQuery(document).off('ajaxComplete');
       });
       Test.pendingAjaxRequests = null;
+      Test.waiters = null;
 
       // Other cleanup
 
@@ -47379,25 +47650,34 @@ enifed("ember-testing/tests/helpers_test",
     });
 
     test("`wait` respects registerWaiters", function() {
-      expect(2);
+      expect(3);
 
       var counter=0;
       function waiter() {
         return ++counter > 2;
       }
 
+      var other=0;
+      function otherWaiter() {
+        return ++other > 2;
+      }
+
       run(App, App.advanceReadiness);
       Test.registerWaiter(waiter);
+      Test.registerWaiter(otherWaiter);
 
       App.testHelpers.wait().then(function() {
         equal(waiter(), true, 'should not resolve until our waiter is ready');
         Test.unregisterWaiter(waiter);
-        equal(Test.waiters.length, 0, 'should not leave a waiter registered');
+        equal(Test.waiters.length, 1, 'should not leave the waiter registered');
+        other = 0;
+        return App.testHelpers.wait();
+      }).then(function() {
+        equal(otherWaiter(), true, 'other waiter is still registered');
       });
     });
 
-
-    test("`visit` advances readiness.", function(){
+    test("`visit` advances readiness.", function() {
       expect(2);
 
       equal(App._readinessDeferrals, 1, "App is in deferred state after setupForTesting.");
@@ -47436,7 +47716,7 @@ enifed("ember-testing/tests/helpers_test",
     });
 
     test("`click` triggers appropriate events in order", function() {
-      expect(4);
+      expect(5);
 
       var click, wait, events;
 
@@ -47460,7 +47740,7 @@ enifed("ember-testing/tests/helpers_test",
         })
       });
 
-      Ember.TEMPLATES.index = compile('{{input type="text"}} {{view view.Checkbox}} {{textarea}}');
+      Ember.TEMPLATES.index = compile('{{input type="text"}} {{view view.Checkbox}} {{textarea}} <div contenteditable="true"> </div>');
 
       run(App, App.advanceReadiness);
 
@@ -47488,6 +47768,13 @@ enifed("ember-testing/tests/helpers_test",
         deepEqual(events,
           ['mousedown', 'focusin', 'mouseup', 'click'],
           'fires focus events on textareas');
+      }).then(function() {
+        events = [];
+        return click('.index-view div');
+      }).then(function() {
+        deepEqual(events,
+          ['mousedown', 'focusin', 'mouseup', 'click'],
+          'fires focus events on contenteditable');
       }).then(function() {
         // In IE (< 8), the change event only fires when the value changes before element focused.
         jQuery('.index-view input[type=checkbox]').focus();
@@ -47519,7 +47806,7 @@ enifed("ember-testing/tests/helpers_test",
 
 
     test("`wait` respects registerWaiters with optional context", function() {
-      expect(2);
+      expect(3);
 
       var obj = {
         counter: 0,
@@ -47528,17 +47815,34 @@ enifed("ember-testing/tests/helpers_test",
         }
       };
 
+      var other=0;
+      function otherWaiter() {
+        return ++other > 2;
+      }
+
       run(App, App.advanceReadiness);
       Test.registerWaiter(obj, obj.ready);
+      Test.registerWaiter(otherWaiter);
 
       App.testHelpers.wait().then(function() {
         equal(obj.ready(), true, 'should not resolve until our waiter is ready');
         Test.unregisterWaiter(obj, obj.ready);
-        equal(Test.waiters.length, 0, 'should not leave a waiter registered');
+        equal(Test.waiters.length, 1, 'should not leave the waiter registered');
+        return App.testHelpers.wait();
+      }).then(function() {
+        equal(otherWaiter(), true, 'other waiter should still be registered');
+      });
+    });
+
+    test("`wait` does not error if routing has not begun", function() {
+      expect(1);
+
+      App.testHelpers.wait().then(function() {
+        ok(true, 'should not error without `visit`');
       });
     });
 
-    test("`triggerEvent accepts an optional options hash without context", function(){
+    test("`triggerEvent accepts an optional options hash without context", function() {
       expect(3);
 
       var triggerEvent, wait, event;
@@ -50690,17 +50994,18 @@ enifed("ember-views/tests/views/component_test.jshint",
     });
   });
 enifed("ember-views/tests/views/container_view_test",
-  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/computed","ember-runtime/controllers/controller","ember-views/system/jquery","ember-views/views/view","ember-views/views/container_view"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/computed","ember-metal/streams/utils","ember-runtime/controllers/controller","ember-views/system/jquery","ember-views/views/view","ember-views/views/container_view"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__) {
     "use strict";
     var get = __dependency1__.get;
     var set = __dependency2__.set;
     var run = __dependency3__["default"];
     var computed = __dependency4__.computed;
-    var Controller = __dependency5__["default"];
-    var jQuery = __dependency6__["default"];
-    var View = __dependency7__["default"];
-    var ContainerView = __dependency8__["default"];
+    var read = __dependency5__.read;
+    var Controller = __dependency6__["default"];
+    var jQuery = __dependency7__["default"];
+    var View = __dependency8__["default"];
+    var ContainerView = __dependency9__["default"];
 
     var trim = jQuery.trim;
     var container, view, otherContainer;
@@ -50995,8 +51300,8 @@ enifed("ember-views/tests/views/container_view_test",
       equal(container.objectAt(0), mainView, "should have the currentView as the only child view");
       equal(mainView.get('parentView'), container, "parentView is setup");
       equal(context, container.get('context'), 'context preserved');
-      equal(mainView._keywords.controller.value(), controller, 'controller keyword is setup');
-      equal(mainView._keywords.view.value(), mainView, 'view keyword is setup');
+      equal(read(mainView._keywords.controller), controller, 'controller keyword is setup');
+      equal(read(mainView._keywords.view), mainView, 'view keyword is setup');
     });
 
     test("if a ContainerView is created with a currentView, it is rendered as a child view", function() {
@@ -51024,8 +51329,8 @@ enifed("ember-views/tests/views/container_view_test",
       equal(container.objectAt(0), mainView, "should have the currentView as the only child view");
       equal(mainView.get('parentView'), container, "parentView is setup");
       equal(context, container.get('context'), 'context preserved');
-      equal(mainView._keywords.controller.value(), controller, 'controller keyword is setup');
-      equal(mainView._keywords.view.value(), mainView, 'view keyword is setup');
+      equal(read(mainView._keywords.controller), controller, 'controller keyword is setup');
+      equal(read(mainView._keywords.view), mainView, 'view keyword is setup');
     });
 
     test("if a ContainerView starts with no currentView and then one is set, the ContainerView is updated", function() {
@@ -51059,8 +51364,8 @@ enifed("ember-views/tests/views/container_view_test",
       equal(container.objectAt(0), mainView, "should have the currentView as the only child view");
       equal(mainView.get('parentView'), container, "parentView is setup");
       equal(context, container.get('context'), 'context preserved');
-      equal(mainView._keywords.controller.value(), controller, 'controller keyword is setup');
-      equal(mainView._keywords.view.value(), mainView, 'view keyword is setup');
+      equal(read(mainView._keywords.controller), controller, 'controller keyword is setup');
+      equal(read(mainView._keywords.view), mainView, 'view keyword is setup');
     });
 
     test("if a ContainerView starts with a currentView and then is set to null, the ContainerView is updated", function() {
@@ -51089,8 +51394,8 @@ enifed("ember-views/tests/views/container_view_test",
       equal(container.objectAt(0), mainView, "should have the currentView as the only child view");
       equal(mainView.get('parentView'), container, "parentView is setup");
       equal(context, container.get('context'), 'context preserved');
-      equal(mainView._keywords.controller.value(), controller, 'controller keyword is setup');
-      equal(mainView._keywords.view.value(), mainView, 'view keyword is setup');
+      equal(read(mainView._keywords.controller), controller, 'controller keyword is setup');
+      equal(read(mainView._keywords.view), mainView, 'view keyword is setup');
 
       run(function() {
         set(container, 'currentView', null);
@@ -51126,8 +51431,8 @@ enifed("ember-views/tests/views/container_view_test",
       equal(container.objectAt(0), mainView, "should have the currentView as the only child view");
       equal(mainView.get('parentView'), container, "parentView is setup");
       equal(context, container.get('context'), 'context preserved');
-      equal(mainView._keywords.controller.value(), controller, 'controller keyword is setup');
-      equal(mainView._keywords.view.value(), mainView, 'view keyword is setup');
+      equal(read(mainView._keywords.controller), controller, 'controller keyword is setup');
+      equal(read(mainView._keywords.view), mainView, 'view keyword is setup');
 
       run(function() {
         set(container, 'currentView', null);
@@ -51865,23 +52170,26 @@ enifed("ember-views/tests/views/select_test",
       ok(select.$().is(":disabled"));
     });
 
-    test("should begin required if the required attribute is true", function() {
-      select.set('required', true);
-      append();
+    // Browsers before IE10 do not support the required property.
+    if (document && ('required' in document.createElement('input'))) {
+      test("should begin required if the required attribute is true", function() {
+        select.set('required', true);
+        append();
 
-      ok(select.element.required, 'required property is truthy');
-    });
+        ok(select.element.required, 'required property is truthy');
+      });
 
-    test("should become required if the required attribute is changed", function() {
-      append();
-      ok(!select.element.required, 'required property is falsy');
+      test("should become required if the required attribute is changed", function() {
+        append();
+        ok(!select.element.required, 'required property is falsy');
 
-      run(function() { select.set('required', true); });
-      ok(select.element.required, 'required property is truthy');
+        run(function() { select.set('required', true); });
+        ok(select.element.required, 'required property is truthy');
 
-      run(function() { select.set('required', false); });
-      ok(!select.element.required, 'required property is falsy');
-    });
+        run(function() { select.set('required', false); });
+        ok(!select.element.required, 'required property is falsy');
+      });
+    }
 
     test("should become disabled if the disabled attribute is changed", function() {
       append();
@@ -52922,7 +53230,7 @@ enifed("ember-views/tests/views/text_field_test",
       }
     });
 
-    test("should become disabled if the disabled attribute is true", function() {
+    test("should become disabled if the disabled attribute is true before append", function() {
       textField.set('disabled', true);
       append();
 
@@ -53887,6 +54195,21 @@ enifed("ember-views/tests/views/view/attribute_bindings_test",
       ok(!view.$().attr('notNumber'), "removes notNumber attribute when NaN");
     });
 
+    test("should normalize case for attribute bindings", function() {
+      view = EmberView.create({
+        tagName: 'input',
+        attributeBindings: ['disAbled'],
+
+        disAbled: true
+      });
+
+      run(function() {
+        view.createElement();
+      });
+
+      ok(view.$().prop('disabled'), "sets property with correct case");
+    });
+
     test("should update attribute bindings", function() {
       view = EmberView.create({
         classNameBindings: ['priority', 'isUrgent', 'isClassified:classified', 'canIgnore'],
@@ -65639,4 +65962,116 @@ enifed("ember/tests/routing/substates_test.jshint",
       ok(true, 'ember/tests/routing/substates_test.js should pass jshint.'); 
     });
   });
+enifed("htmlbars-test-helpers",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function equalInnerHTML(fragment, html) {
+      var actualHTML = normalizeInnerHTML(fragment.innerHTML);
+      QUnit.push(actualHTML === html, actualHTML, html);
+    }
+
+    __exports__.equalInnerHTML = equalInnerHTML;function equalHTML(node, html) {
+      var fragment;
+      if (!node.nodeType && node.length) {
+        fragment = document.createDocumentFragment();
+        while (node[0]) {
+          fragment.appendChild(node[0]);
+        }
+      } else {
+        fragment = node;
+      }
+
+      var div = document.createElement("div");
+      div.appendChild(fragment.cloneNode(true));
+
+      equalInnerHTML(div, html);
+    }
+
+    __exports__.equalHTML = equalHTML;// detect weird IE8 html strings
+    var ie8InnerHTMLTestElement = document.createElement('div');
+    ie8InnerHTMLTestElement.setAttribute('id', 'womp');
+    var ie8InnerHTML = (ie8InnerHTMLTestElement.outerHTML.indexOf('id=womp') > -1);
+
+    // detect side-effects of cloning svg elements in IE9-11
+    var ieSVGInnerHTML = (function () {
+      if (!document.createElementNS) {
+        return false;
+      }
+      var div = document.createElement('div');
+      var node = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+      div.appendChild(node);
+      var clone = div.cloneNode(true);
+      return clone.innerHTML === '<svg xmlns="http://www.w3.org/2000/svg" />';
+    })();
+
+    function normalizeInnerHTML(actualHTML) {
+      if (ie8InnerHTML) {
+        // drop newlines in IE8
+        actualHTML = actualHTML.replace(/\r\n/gm, '');
+        // downcase ALLCAPS tags in IE8
+        actualHTML = actualHTML.replace(/<\/?[A-Z\-]+/gi, function(tag){
+          return tag.toLowerCase();
+        });
+        // quote ids in IE8
+        actualHTML = actualHTML.replace(/id=([^ >]+)/gi, function(match, id){
+          return 'id="'+id+'"';
+        });
+        // IE8 adds ':' to some tags
+        // <keygen> becomes <:keygen>
+        actualHTML = actualHTML.replace(/<(\/?):([^ >]+)/gi, function(match, slash, tag){
+          return '<'+slash+tag;
+        });
+
+        // Normalize the style attribute
+        actualHTML = actualHTML.replace(/style="(.+?)"/gi, function(match, val){
+          return 'style="'+val.toLowerCase()+';"';
+        });
+
+      }
+      if (ieSVGInnerHTML) {
+        // Replace `<svg xmlns="http://www.w3.org/2000/svg" height="50%" />` with `<svg height="50%"></svg>`, etc.
+        // drop namespace attribute
+        actualHTML = actualHTML.replace(/ xmlns="[^"]+"/, '');
+        // replace self-closing elements
+        actualHTML = actualHTML.replace(/<([^ >]+) [^\/>]*\/>/gi, function(tag, tagName) {
+          return tag.slice(0, tag.length - 3) + '></' + tagName + '>';
+        });
+      }
+
+      return actualHTML;
+    }
+
+    __exports__.normalizeInnerHTML = normalizeInnerHTML;// detect weird IE8 checked element string
+    var checkedInput = document.createElement('input');
+    checkedInput.setAttribute('checked', 'checked');
+    var checkedInputString = checkedInput.outerHTML;
+    function isCheckedInputHTML(element) {
+      equal(element.outerHTML, checkedInputString);
+    }
+
+    __exports__.isCheckedInputHTML = isCheckedInputHTML;// check which property has the node's text content
+    var textProperty = document.createElement('div').textContent === undefined ? 'innerText' : 'textContent';
+    function getTextContent(el) {
+      // textNode
+      if (el.nodeType === 3) {
+        return el.nodeValue;
+      } else {
+        return el[textProperty];
+      }
+    }
+
+    __exports__.getTextContent = getTextContent;// IE8 does not have Object.create, so use a polyfill if needed.
+    // Polyfill based on Mozilla's (MDN)
+    function createObject(obj) {
+      if (typeof Object.create === 'function') {
+        return Object.create(obj);
+      } else {
+        var Temp = function() {};
+        Temp.prototype = obj;
+        return new Temp();
+      }
+    }
+    __exports__.createObject = createObject;
+  });
 })();