ember-source 1.11.0.beta.5 → 1.11.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.11.0-beta.5.1501308c
+ * @version   1.11.0
  */
 
 (function() {
@@ -428,13 +428,12 @@ enifed('ember-testing/adapters/qunit', ['exports', 'ember-testing/adapters/adapt
   });
 
 });
-enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get', 'ember-metal/error', 'ember-metal/run_loop', 'ember-views/system/jquery', 'ember-testing/test'], function (Ember, property_get, EmberError, run, jQuery, Test) {
+enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get', 'ember-metal/error', 'ember-metal/run_loop', 'ember-views/system/jquery', 'ember-testing/test', 'ember-runtime/ext/rsvp'], function (Ember, property_get, EmberError, run, jQuery, Test, RSVP) {
 
   'use strict';
 
   var helper = Test['default'].registerHelper;
   var asyncHelper = Test['default'].registerAsyncHelper;
-  var countAsync = 0;
 
   function currentRouteName(app) {
     var appController = app.__container__.lookup('controller:application');
@@ -621,12 +620,7 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   }
 
   function wait(app, value) {
-    return Test['default'].promise(function(resolve) {
-      // If this is the first async promise, kick off the async test
-      if (++countAsync === 1) {
-        Test['default'].adapter.asyncStart();
-      }
-
+    return new RSVP['default'].Promise(function(resolve) {
       // Every 10ms, poll for the async thing to have finished
       var watcher = setInterval(function() {
         var router = app.__container__.lookup('router:main');
@@ -650,11 +644,6 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
         // Stop polling
         clearInterval(watcher);
 
-        // If this is the last async promise, end the async test
-        if (--countAsync === 0) {
-          Test['default'].adapter.asyncEnd();
-        }
-
         // Synchronously resolve the promise
         run['default'](null, resolve, value);
       }, 10);
@@ -1306,7 +1295,7 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
 
     return function() {
       var args = slice.call(arguments);
-      var lastPromise = Test.lastPromise;
+      var lastPromise;
 
       args.unshift(app);
 
@@ -1317,35 +1306,28 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
         return fn.apply(app, args);
       }
 
-      if (!lastPromise) {
-        // It's the first async helper in current context
-        lastPromise = fn.apply(app, args);
-      } else {
-        // wait for last helper's promise to resolve and then
-        // execute. To be safe, we need to tell the adapter we're going
-        // asynchronous here, because fn may not be invoked before we
-        // return.
-        Test.adapter.asyncStart();
-        run(function() {
-          lastPromise = Test.resolve(lastPromise).then(function() {
-            try {
-              return fn.apply(app, args);
-            } finally {
-              Test.adapter.asyncEnd();
-            }
-          });
-        });
-      }
+      lastPromise = run(function() {
+        return Test.resolve(Test.lastPromise);
+      });
 
-      return lastPromise;
+      // wait for last helper's promise to resolve and then
+      // execute. To be safe, we need to tell the adapter we're going
+      // asynchronous here, because fn may not be invoked before we
+      // return.
+      Test.adapter.asyncStart();
+      return lastPromise.then(function() {
+        return fn.apply(app, args);
+      })["finally"](function() {
+        Test.adapter.asyncEnd();
+      });
     };
   }
 
   function run(fn) {
     if (!emberRun['default'].currentRunLoop) {
-      emberRun['default'](fn);
+      return emberRun['default'](fn);
     } else {
-      fn();
+      return fn();
     }
   }
 
@@ -1509,6 +1491,7 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
 
   Test.Promise.prototype = create['default'](RSVP['default'].Promise.prototype);
   Test.Promise.prototype.constructor = Test.Promise;
+  Test.Promise.resolve = Test.resolve;
 
   // Patch `then` to isolate async methods
   // specifically `Ember.Test.lastPromise`
@@ -1525,7 +1508,6 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
   // 1. Set `Ember.Test.lastPromise` to null
   // 2. Invoke method
   // 3. Return the last promise created during method
-  // 4. Restore `Ember.Test.lastPromise` to original value
   function isolate(fn, val) {
     var value, lastPromise;
 
@@ -1535,6 +1517,7 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
     value = fn(val);
 
     lastPromise = Test.lastPromise;
+    Test.lastPromise = null;
 
     // If the method returned a promise
     // return that promise. If not,
@@ -1542,12 +1525,11 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
     if ((value && (value instanceof Test.Promise)) || !lastPromise) {
       return value;
     } else {
-      run(function() {
-        lastPromise = Test.resolve(lastPromise).then(function() {
+      return run(function() {
+        return Test.resolve(lastPromise).then(function() {
           return value;
         });
       });
-      return lastPromise;
     }
   }
 

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.11.0-beta.5.1501308c
+ * @version   1.11.0
  */
 
 (function() {
@@ -3406,6 +3406,14 @@ enifed('ember-debug/tests/main_test', ['ember-metal/core'], function (Ember) {
 
   QUnit.module('ember-debug');
 
+  QUnit.test('Ember.deprecate throws deprecation with one argument', function() {
+    expect(1);
+
+    throws(function() {
+      Ember['default'].deprecate('Deprecation is thrown');
+    });
+  });
+
   QUnit.test('Ember.deprecate throws deprecation if second argument is falsy', function() {
     expect(3);
 
@@ -5390,8 +5398,8 @@ enifed('ember-htmlbars/tests/attr_nodes/boolean_test', ['ember-views/views/view'
     run['default'](function() { view.appendTo('#qunit-fixture'); });
   }
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.module("ember-htmlbars: boolean attribute", {
     teardown: function() {
@@ -5475,9 +5483,8 @@ enifed('ember-htmlbars/tests/attr_nodes/boolean_test', ['ember-views/views/view'
           'boolean property is set false');
   });
 
-
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/boolean_test.jscs-test', function () {
@@ -5515,8 +5522,8 @@ enifed('ember-htmlbars/tests/attr_nodes/class_test', ['ember-views/views/view',
     isInlineIfEnabled = true;
   
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.module("ember-htmlbars: class attribute", {
     teardown: function() {
@@ -5652,8 +5659,8 @@ enifed('ember-htmlbars/tests/attr_nodes/class_test', ['ember-views/views/view',
     ok(view.element.firstChild.className, 'r b a c', 'classes are in the right order');
   });
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/class_test.jscs-test', function () {
@@ -5965,8 +5972,8 @@ enifed('ember-htmlbars/tests/attr_nodes/href_test', ['ember-views/views/view', '
     run['default'](function() { view.appendTo('#qunit-fixture'); });
   }
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.module("ember-htmlbars: href attribute", {
     teardown: function() {
@@ -5987,8 +5994,8 @@ enifed('ember-htmlbars/tests/attr_nodes/href_test', ['ember-views/views/view', '
                    "attribute is output");
   });
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/href_test.jscs-test', function () {
@@ -6028,8 +6035,8 @@ enifed('ember-htmlbars/tests/attr_nodes/property_test', ['ember-views/views/view
     return input.maxLength === 0;
   }
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.module("ember-htmlbars: property", {
     teardown: function() {
@@ -6082,8 +6089,8 @@ enifed('ember-htmlbars/tests/attr_nodes/property_test', ['ember-views/views/view
     ok(true, "no legacy assertion prohibited setting an array");
   });
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/property_test.jscs-test', function () {
@@ -6120,26 +6127,41 @@ enifed('ember-htmlbars/tests/attr_nodes/sanitized_test', ['ember-views/views/vie
     }
   });
 
-  
   // jscs:disable validateIndentation
+  // jscs:disable disallowTrailingWhitespace
+  
 
   var badTags = [
     { tag: 'a', attr: 'href',
       unquotedTemplate: compile['default']("<a href={{url}}></a>"),
       quotedTemplate: compile['default']("<a href='{{url}}'></a>"),
       multipartTemplate: compile['default']("<a href='{{protocol}}{{path}}'></a>") },
+
+    { tag: 'base', attr: 'href',
+      unquotedTemplate: compile['default']("<base href={{url}} />"),
+      quotedTemplate: compile['default']("<base href='{{url}}'/>"),
+      multipartTemplate: compile['default']("<base href='{{protocol}}{{path}}'/>") },
+
+    { tag: 'embed', attr: 'src',
+      unquotedTemplate: compile['default']("<embed src={{url}} />"),
+      quotedTemplate: compile['default']("<embed src='{{url}}'/>"),
+      multipartTemplate: compile['default']("<embed src='{{protocol}}{{path}}'/>") },
+
     { tag: 'body', attr: 'background',
       unquotedTemplate: compile['default']("<body background={{url}}></body>"),
       quotedTemplate: compile['default']("<body background='{{url}}'></body>"),
       multipartTemplate: compile['default']("<body background='{{protocol}}{{path}}'></body>") },
+
     { tag: 'link', attr: 'href',
       unquotedTemplate: compile['default']("<link href={{url}}>"),
       quotedTemplate: compile['default']("<link href='{{url}}'>"),
       multipartTemplate: compile['default']("<link href='{{protocol}}{{path}}'>") },
+
     { tag: 'img', attr: 'src',
       unquotedTemplate: compile['default']("<img src={{url}}>"),
       quotedTemplate: compile['default']("<img src='{{url}}'>"),
       multipartTemplate: compile['default']("<img src='{{protocol}}{{path}}'>") },
+
     { tag: 'iframe', attr: 'src',
       // Setting an iframe with a bad protocol results in the browser
       // being redirected. in IE8. Skip the iframe tests on that platform.
@@ -6214,8 +6236,9 @@ enifed('ember-htmlbars/tests/attr_nodes/sanitized_test', ['ember-views/views/vie
     })(); //jshint ignore:line
   }
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable disallowTrailingWhitespace
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/sanitized_test.jscs-test', function () {
@@ -6237,6 +6260,104 @@ enifed('ember-htmlbars/tests/attr_nodes/sanitized_test.jshint', function () {
     ok(true, 'ember-htmlbars/tests/attr_nodes/sanitized_test.js should pass jshint.'); 
   });
 
+});
+enifed('ember-htmlbars/tests/attr_nodes/style_test', ['ember-metal/core', 'ember-views/views/view', 'ember-template-compiler/system/compile', 'ember-htmlbars/utils/string', 'ember-runtime/tests/utils', 'ember-views/attr_nodes/attr_node'], function (Ember, EmberView, compile, string, utils, attr_node) {
+
+  'use strict';
+
+  /* globals EmberDev */
+
+  var view, originalWarn, warnings;
+
+  QUnit.module("ember-htmlbars: style attribute", {
+    setup: function() {
+      warnings = [];
+      originalWarn = Ember['default'].warn;
+      Ember['default'].warn = function(message, test) {
+        if (!test) {
+          warnings.push(message);
+        }
+      };
+    },
+
+    teardown: function() {
+      utils.runDestroy(view);
+      Ember['default'].warn = originalWarn;
+    }
+  });
+
+  // jscs:disable validateIndentation
+  
+
+  if (!EmberDev.runningProdBuild) {
+    QUnit.test('specifying `<div style={{userValue}}></div>` generates a warning', function() {
+      view = EmberView['default'].create({
+        userValue: 'width: 42px',
+        template: compile['default']('<div style={{view.userValue}}></div>')
+      });
+
+      utils.runAppend(view);
+
+      deepEqual(warnings, [attr_node.styleWarning]);
+    });
+
+    QUnit.test('specifying `attributeBindings: ["style"]` generates a warning', function() {
+      view = EmberView['default'].create({
+        userValue: 'width: 42px',
+        template: compile['default']('<div style={{view.userValue}}></div>')
+      });
+
+      utils.runAppend(view);
+
+      deepEqual(warnings, [attr_node.styleWarning]);
+    });
+  }
+
+  QUnit.test('specifying `<div style={{{userValue}}}></div>` works properly without a warning', function() {
+    view = EmberView['default'].create({
+      userValue: 'width: 42px',
+      template: compile['default']('<div style={{{view.userValue}}}></div>')
+    });
+
+    utils.runAppend(view);
+
+    deepEqual(warnings, [ ]);
+  });
+
+  QUnit.test('specifying `<div style={{userValue}}></div>` works properly with a SafeString', function() {
+    view = EmberView['default'].create({
+      userValue: new string.SafeString('width: 42px'),
+      template: compile['default']('<div style={{view.userValue}}></div>')
+    });
+
+    utils.runAppend(view);
+
+    deepEqual(warnings, [ ]);
+  });
+
+  
+  // jscs:enable validateIndentation
+
+});
+enifed('ember-htmlbars/tests/attr_nodes/style_test.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-htmlbars/tests/attr_nodes');
+  test('ember-htmlbars/tests/attr_nodes/style_test.js should pass jscs', function() {
+    ok(true, 'ember-htmlbars/tests/attr_nodes/style_test.js should pass jscs.');
+  });
+
+});
+enifed('ember-htmlbars/tests/attr_nodes/style_test.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-htmlbars/tests/attr_nodes');
+  test('ember-htmlbars/tests/attr_nodes/style_test.js should pass jshint', function() { 
+    ok(true, 'ember-htmlbars/tests/attr_nodes/style_test.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-htmlbars/tests/attr_nodes/svg_test', ['ember-views/views/view', 'ember-metal/run_loop', 'ember-template-compiler/system/compile', 'htmlbars-test-helpers'], function (EmberView, run, compile, htmlbars_test_helpers) {
 
@@ -6248,8 +6369,8 @@ enifed('ember-htmlbars/tests/attr_nodes/svg_test', ['ember-views/views/view', 'e
     run['default'](function() { view.appendTo('#qunit-fixture'); });
   }
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.module("ember-htmlbars: svg attribute", {
     teardown: function() {
@@ -6314,8 +6435,8 @@ enifed('ember-htmlbars/tests/attr_nodes/svg_test', ['ember-views/views/view', 'e
     htmlbars_test_helpers.equalInnerHTML(view.element, '<svg class="red tall"></svg>', "attribute is output");
   });
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/svg_test.jscs-test', function () {
@@ -6348,8 +6469,8 @@ enifed('ember-htmlbars/tests/attr_nodes/value_test', ['ember-views/views/view',
     run['default'](function() { view.appendTo('#qunit-fixture'); });
   }
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.module("ember-htmlbars: value attribute", {
     teardown: function() {
@@ -6395,8 +6516,8 @@ enifed('ember-htmlbars/tests/attr_nodes/value_test', ['ember-views/views/view',
           'property is set true');
   });
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-htmlbars/tests/attr_nodes/value_test.jscs-test', function () {
@@ -7540,15 +7661,17 @@ enifed('ember-htmlbars/tests/compat/precompile_test.jshint', function () {
   });
 
 });
-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', 'ember-htmlbars/helpers', 'ember-template-compiler/system/compile'], function (Ember, run, Namespace, EmberView, _MetamorphView, EmberObject, native_array, computed, observer, system__container, property_set, utils, helpers, compile) {
+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', 'ember-views/attr_nodes/attr_node', 'ember-htmlbars/utils/string', 'ember-htmlbars/helpers', 'ember-template-compiler/system/compile'], function (Ember, run, Namespace, EmberView, _MetamorphView, EmberObject, native_array, computed, observer, system__container, property_set, utils, attr_node, string, helpers, compile) {
 
   'use strict';
 
+  /*globals EmberDev */
   /*jshint newcap:false*/
+
   var view;
 
   var originalLookup = Ember['default'].lookup;
-  var TemplateTests, registry, container, lookup;
+  var TemplateTests, registry, container, lookup, warnings, originalWarn;
 
   /**
     This module specifically tests integration with Handlebars and Ember-specific
@@ -7566,6 +7689,14 @@ enifed('ember-htmlbars/tests/helpers/bind_attr_test', ['ember-metal/core', 'embe
       registry.optionsForType('template', { instantiate: false });
       registry.register('view:default', _MetamorphView['default']);
       registry.register('view:toplevel', EmberView['default'].extend());
+
+      warnings = [];
+      originalWarn = Ember['default'].warn;
+      Ember['default'].warn = function(message, test) {
+        if (!test) {
+          warnings.push(message);
+        }
+      };
     },
 
     teardown: function() {
@@ -7574,6 +7705,7 @@ enifed('ember-htmlbars/tests/helpers/bind_attr_test', ['ember-metal/core', 'embe
       registry = container = view = null;
 
       Ember['default'].lookup = lookup = originalLookup;
+      Ember['default'].warn = originalWarn;
       TemplateTests = null;
     }
   });
@@ -8105,7 +8237,7 @@ enifed('ember-htmlbars/tests/helpers/bind_attr_test', ['ember-metal/core', 'embe
     }, /You cannot set `data-bar` manually and via `{{bind-attr}}` helper on the same element/);
   });
 
-  QUnit.test("src attribute bound to undefined is not present", function() {
+  QUnit.test("src attribute bound to undefined is empty", function() {
     var template = compile['default']("<img {{bind-attr src=view.undefinedValue}}>");
 
     view = EmberView['default'].create({
@@ -8115,10 +8247,10 @@ enifed('ember-htmlbars/tests/helpers/bind_attr_test', ['ember-metal/core', 'embe
 
     utils.runAppend(view);
 
-    ok(!view.element.hasAttribute('src'), "src attribute not present");
+    equal(view.element.firstChild.getAttribute('src'), '', "src attribute is empty");
   });
 
-  QUnit.test("src attribute bound to null is not present", function() {
+  QUnit.test("src attribute bound to null is empty", function() {
     var template = compile['default']("<img {{bind-attr src=view.nullValue}}>");
 
     view = EmberView['default'].create({
@@ -8128,7 +8260,69 @@ enifed('ember-htmlbars/tests/helpers/bind_attr_test', ['ember-metal/core', 'embe
 
     utils.runAppend(view);
 
-    ok(!view.element.hasAttribute('src'), "src attribute not present");
+    equal(view.element.firstChild.getAttribute('src'), '', "src attribute is empty");
+  });
+
+  QUnit.test("src attribute will be cleared when the value is set to null or undefined", function() {
+    var template = compile['default']("<img {{bind-attr src=view.value}}>");
+
+    view = EmberView['default'].create({
+      template: template,
+      value: 'one'
+    });
+
+    utils.runAppend(view);
+
+    equal(view.element.firstChild.getAttribute('src'), 'one', "src attribute is present");
+
+    run['default'](function() {
+      property_set.set(view, 'value', 'two');
+    });
+
+    equal(view.element.firstChild.getAttribute('src'), 'two', "src attribute is present");
+
+    run['default'](function() {
+      property_set.set(view, 'value', null);
+    });
+
+    equal(view.element.firstChild.getAttribute('src'), '', "src attribute is empty");
+
+    run['default'](function() {
+      property_set.set(view, 'value', 'three');
+    });
+
+    equal(view.element.firstChild.getAttribute('src'), 'three', "src attribute is present");
+
+    run['default'](function() {
+      property_set.set(view, 'value', undefined);
+    });
+
+    equal(view.element.firstChild.getAttribute('src'), '', "src attribute is empty");
+  });
+
+  if (!EmberDev.runningProdBuild) {
+
+    QUnit.test('specifying `<div {{bind-attr style=userValue}}></div>` triggers a warning', function() {
+      view = EmberView['default'].create({
+        userValue: '42',
+        template: compile['default']('<div {{bind-attr style=view.userValue}}></div>')
+      });
+
+      utils.runAppend(view);
+
+      deepEqual(warnings, [attr_node.styleWarning]);
+    });
+  }
+
+  QUnit.test('specifying `<div {{bind-attr style=userValue}}></div>` works properly with a SafeString', function() {
+    view = EmberView['default'].create({
+      userValue: new string.SafeString('42'),
+      template: compile['default']('<div {{bind-attr style=view.userValue}}></div>')
+    });
+
+    utils.runAppend(view);
+
+    deepEqual(warnings, [ ]);
   });
 
 });
@@ -8299,8 +8493,8 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
     var container = registry.container();
 
     var ACollectionView = CollectionView['default'].extend({
-          tagName: 'ul',
-          content: native_array.A(['foo', 'bar', 'baz'])
+      tagName: 'ul',
+      content: native_array.A(['foo', 'bar', 'baz'])
     });
 
     registry.register('view:collectionTest', ACollectionView);
@@ -8499,7 +8693,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
     equal(view.$('ul li.baz').length, 3, "adds class attribute");
   });
 
-  QUnit.test("should give its item views the classBinding specified by itemClassBinding", function() {
+  QUnit.test("should give its item views the class specified by itemClass", function() {
     var ItemClassBindingTestCollectionView = CollectionView['default'].extend({
       tagName: 'ul',
       content: native_array.A([EmberObject['default'].create({ isBaz: false }), EmberObject['default'].create({ isBaz: true }), EmberObject['default'].create({ isBaz: true })])
@@ -8508,7 +8702,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
     view = EmberView['default'].create({
       itemClassBindingTestCollectionView: ItemClassBindingTestCollectionView,
       isBar: true,
-      template: compile['default']('{{#collection view.itemClassBindingTestCollectionView itemClassBinding="view.isBar"}}foo{{/collection}}')
+      template: compile['default']('{{#collection view.itemClassBindingTestCollectionView itemClass=view.isBar}}foo{{/collection}}')
     });
 
     utils.runAppend(view);
@@ -8519,7 +8713,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
     // to introduce a new keyword that could be used from within `itemClassBinding`. For instance, `itemClassBinding="item.isBaz"`.
   });
 
-  QUnit.test("should give its item views the property specified by itemPropertyBinding", function() {
+  QUnit.test("should give its item views the property specified by itemProperty", function() {
     var ItemPropertyBindingTestItemView = EmberView['default'].extend({
       tagName: 'li'
     });
@@ -8534,7 +8728,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
           return ItemPropertyBindingTestItemView;
         }
       },
-      template: compile['default']('{{#collection contentBinding="view.content" tagName="ul" itemViewClass="item-property-binding-test-item-view" itemPropertyBinding="view.baz" preserveContext=false}}{{view.property}}{{/collection}}')
+      template: compile['default']('{{#collection content=view.content tagName="ul" itemViewClass="item-property-binding-test-item-view" itemProperty=view.baz preserveContext=false}}{{view.property}}{{/collection}}')
     });
 
     utils.runAppend(view);
@@ -8556,7 +8750,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
     view = EmberView['default'].create({
       baz: "baz",
       content: native_array.A([EmberObject['default'].create(), EmberObject['default'].create(), EmberObject['default'].create()]),
-      template: compile['default']('{{#collection contentBinding="view.content" itemPropertyBinding="view.baz"}}{{view.property}}{{/collection}}')
+      template: compile['default']('{{#collection content=view.content itemProperty=view.baz}}{{view.property}}{{/collection}}')
     });
 
     utils.runAppend(view);
@@ -8817,7 +9011,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
       controller: {
         items: items
       },
-      template: compile['default']('{{collection contentBinding="items" itemViewClass="an-item"}}')
+      template: compile['default']('{{collection content=items itemViewClass="an-item"}}')
     });
 
     utils.runAppend(view);
@@ -9185,7 +9379,7 @@ enifed('ember-htmlbars/tests/helpers/each_test', ['ember-metal/core', 'ember-run
   var originalLookup = Ember['default'].lookup;
   var lookup;
 
-  QUnit.module("the #each helper [DEPRECATED]", {
+  QUnit.module("the scope changing #each helper [DEPRECATED]", {
     setup: function() {
       Ember['default'].lookup = lookup = { Ember: Ember['default'] };
 
@@ -9680,8 +9874,8 @@ enifed('ember-htmlbars/tests/helpers/each_test', ['ember-metal/core', 'ember-run
   QUnit.test("it supports {{itemViewClass=}} with tagName (DEPRECATED)", function() {
     utils.runDestroy(view);
     view = EmberView['default'].create({
-        template: templateFor('{{each view.people itemViewClass=MyView tagName="ul"}}'),
-        people: people
+      template: templateFor('{{each view.people itemViewClass=MyView tagName="ul"}}'),
+      people: people
     });
 
     expectDeprecation(/Supplying a tagName to Metamorph views is unreliable and is deprecated./);
@@ -10013,7 +10207,7 @@ enifed('ember-htmlbars/tests/helpers/each_test', ['ember-metal/core', 'ember-run
       view = EmberView['default'].create({
         container: container,
         controller: controller,
-        template: templateFor('{{#EACH|this|personController}}{{#view controllerBinding="personController"}}{{name}}{{/view}}{{/each}}', useBlockParams)
+        template: templateFor('{{#EACH|this|personController}}{{#view controller=personController}}{{name}}{{/view}}{{/each}}', useBlockParams)
       });
 
       utils.runAppend(view);
@@ -11441,6 +11635,44 @@ enifed('ember-htmlbars/tests/helpers/input_test', ['ember-metal/run_loop', 'embe
     equal(view.$('input').prop('checked'), false, "the checkbox isn't checked yet");
   });
 
+  QUnit.module("{{input type='text'}} - null/undefined values", {
+    teardown: function() {
+      utils.runDestroy(view);
+    }
+  });
+
+  QUnit.test("placeholder attribute bound to undefined is not present", function() {
+    view = View['default'].extend({
+      controller: {},
+      template: compile['default']('{{input placeholder=someThingNotThere}}')
+    }).create();
+
+    utils.runAppend(view);
+
+    ok(!view.element.childNodes[1].hasAttribute('placeholder'), "attribute not present");
+
+    run['default'](null, property_set.set, view, 'controller.someThingNotThere', 'foo');
+
+    equal(view.element.childNodes[1].placeholder, 'foo', "attribute is present");
+  });
+
+  QUnit.test("placeholder attribute bound to null is not present", function() {
+    view = View['default'].extend({
+      controller: {
+        someNullProperty: null
+      },
+      template: compile['default']('{{input placeholder=someNullProperty}}')
+    }).create();
+
+    utils.runAppend(view);
+
+    ok(!view.element.childNodes[1].hasAttribute('placeholder'), "attribute not present");
+
+    run['default'](null, property_set.set, view, 'controller.someNullProperty', 'foo');
+
+    equal(view.element.childNodes[1].placeholder, 'foo', "attribute is present");
+  });
+
 });
 enifed('ember-htmlbars/tests/helpers/input_test.jscs-test', function () {
 
@@ -12454,7 +12686,7 @@ enifed('ember-htmlbars/tests/helpers/unbound_test.jshint', function () {
   });
 
 });
-enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'container/registry', '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/controller', 'ember-runtime/tests/utils', 'ember-metal/property_set', 'ember-metal/property_get', 'ember-metal/computed'], function (EmberView, Registry, run, jQuery, TextField, Namespace, EmberObject, ContainerView, _MetamorphView, SafeString, precompile, compile, template, observer, Controller, utils, property_set, property_get, computed) {
+enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'container/registry', '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/controller', 'ember-htmlbars/system/make_bound_helper', 'ember-runtime/tests/utils', 'ember-metal/property_set', 'ember-metal/property_get', 'ember-metal/computed'], function (EmberView, Registry, run, jQuery, TextField, Namespace, EmberObject, ContainerView, _MetamorphView, SafeString, precompile, compile, system__template, observer, Controller, makeBoundHelper, utils, property_set, property_get, computed) {
 
   'use strict';
 
@@ -12486,6 +12718,7 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
       registry = new Registry['default']();
       container = registry.container();
       registry.optionsForType('template', { instantiate: false });
+      registry.optionsForType('helper', { instantiate: false });
       registry.register('view:default', _MetamorphView['default']);
       registry.register('view:toplevel', EmberView['default'].extend());
     },
@@ -12707,15 +12940,17 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
       snork: "nerd"
     }).create();
 
-    utils.runAppend(view);
+    expectDeprecation(function() {
+      utils.runAppend(view);
+    }, /You're attempting to render a view by passing borfBinding to a view helper without a quoted value, but this syntax is ambiguous. You should either surround borfBinding's value in quotes or remove `Binding` from borfBinding./);
 
     equal(jQuery['default']('#lol').text(), "nerd", "awkward mixed syntax treated like binding");
 
     Ember.warn = oldWarn;
   });
 
-  QUnit.test('"Binding"-suffixed bindings are runloop-synchronized', function() {
-    expect(5);
+  QUnit.test('"Binding"-suffixed bindings are runloop-synchronized [DEPRECATED]', function() {
+    expect(6);
 
     var subview;
 
@@ -12734,7 +12969,10 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
     });
 
     view = View.create();
-    utils.runAppend(view);
+
+    expectDeprecation(function() {
+      utils.runAppend(view);
+    }, /You're attempting to render a view by passing colorBinding to a view helper, but this syntax is deprecated. You should use `color=someValue` instead./);
 
     equal(view.$('h1 .color').text(), 'mauve', 'renders bound value');
 
@@ -12853,6 +13091,30 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
     ok(jQuery['default']('#foo').hasClass('foo'), "Always applies classbinding without condition");
   });
 
+  QUnit.test("Should apply a class from a sub expression", function() {
+    registry.register('helper:string-concat', makeBoundHelper['default'](function(params) {
+      return params.join('');
+    }));
+
+    view = EmberView['default'].create({
+      container: container,
+      controller: {
+        type: 'btn',
+        size: 'large'
+      },
+      template: compile['default']('{{#view id="foo" class=(string-concat type "-" size)}} Foo{{/view}}')
+    });
+
+    utils.runAppend(view);
+
+    ok(jQuery['default']('#foo').hasClass('btn-large'), "applies classname from subexpression");
+
+    run['default'](view, view.set, 'controller.size', 'medium');
+
+    ok(!jQuery['default']('#foo').hasClass('btn-large'), "removes classname from subexpression update");
+    ok(jQuery['default']('#foo').hasClass('btn-medium'), "adds classname from subexpression update");
+  });
+
   QUnit.test("Should not apply classes when bound property specified is false", function() {
     view = EmberView['default'].create({
       controller: {
@@ -13403,7 +13665,7 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
     view = EmberView['default'].create({
       name: 'myView',
       textField: TextField['default'],
-      template: compile['default']('{{view view.textField valueBinding="view.name"}}')
+      template: compile['default']('{{view view.textField value=view.name}}')
     });
 
     utils.runAppend(view);
@@ -13475,7 +13737,7 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
         name: 'foo'
       }),
       Subview: Subview,
-      template: compile['default']('<h1>{{view view.Subview colorBinding="color" someControllerBinding="this"}}</h1>')
+      template: compile['default']('<h1>{{view view.Subview color=color someController=this}}</h1>')
     });
 
     view = View.create();
@@ -13572,7 +13834,7 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
 
   QUnit.test('should work with precompiled templates', function() {
     var templateString = precompile['default']('{{view.value}}');
-    var compiledTemplate = template['default'](eval(templateString));
+    var compiledTemplate = system__template['default'](eval(templateString));
 
     view = EmberView['default'].create({
       value: 'rendered',
@@ -13590,7 +13852,7 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
     equal(view.$().text(), 'updated', 'the precompiled template was updated');
   });
 
-  QUnit.test('bindings should be relative to the current context', function() {
+  QUnit.test('bindings should be relative to the current context [DEPRECATED]', function() {
     view = EmberView['default'].create({
       museumOpen: true,
 
@@ -13606,12 +13868,14 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
       template: compile['default']('{{#if view.museumOpen}} {{view view.museumView nameBinding="view.museumDetails.name" dollarsBinding="view.museumDetails.price"}} {{/if}}')
     });
 
-    utils.runAppend(view);
+    expectDeprecation(function() {
+      utils.runAppend(view);
+    }, /You're attempting to render a view by passing .+Binding to a view helper, but this syntax is deprecated/);
 
     equal(trim(view.$().text()), 'Name: SFMoMA Price: $20', 'should print baz twice');
   });
 
-  QUnit.test('bindings should respect keywords', function() {
+  QUnit.test('bindings should respect keywords [DEPRECATED]', function() {
     view = EmberView['default'].create({
       museumOpen: true,
 
@@ -13630,6 +13894,32 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
       template: compile['default']('{{#if view.museumOpen}}{{view view.museumView nameBinding="controller.museumDetails.name" dollarsBinding="controller.museumDetails.price"}}{{/if}}')
     });
 
+    expectDeprecation(function() {
+      utils.runAppend(view);
+    }, /You're attempting to render a view by passing .+Binding to a view helper, but this syntax is deprecated/);
+
+    equal(trim(view.$().text()), 'Name: SFMoMA Price: $20', 'should print baz twice');
+  });
+
+  QUnit.test('should respect keywords', function() {
+    view = EmberView['default'].create({
+      museumOpen: true,
+
+      controller: {
+        museumOpen: true,
+        museumDetails: EmberObject['default'].create({
+          name: 'SFMoMA',
+          price: 20
+        })
+      },
+
+      museumView: EmberView['default'].extend({
+        template: compile['default']('Name: {{view.name}} Price: ${{view.dollars}}')
+      }),
+
+      template: compile['default']('{{#if view.museumOpen}}{{view view.museumView name=controller.museumDetails.name dollars=controller.museumDetails.price}}{{/if}}')
+    });
+
     utils.runAppend(view);
 
     equal(trim(view.$().text()), 'Name: SFMoMA Price: $20', 'should print baz twice');
@@ -13734,6 +14024,44 @@ enifed('ember-htmlbars/tests/helpers/view_test', ['ember-views/views/view', 'con
     }, /must be a subclass or an instance of Ember.View/);
   });
 
+  QUnit.test('Specifying `id` to {{view}} is set on the view.', function() {
+    registry.register('view:derp', EmberView['default'].extend({
+      template: compile['default']('<div id="view-id">{{view.id}}</div><div id="view-elementId">{{view.elementId}}</div>')
+    }));
+
+    view = EmberView['default'].create({
+      container: container,
+      foo: 'bar',
+      template: compile['default']('{{view "derp" id=view.foo}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$('#bar').length, 1, 'it uses the provided id for the views elementId');
+    equal(view.$('#view-id').text(), 'bar', 'the views id property is set');
+    equal(view.$('#view-elementId').text(), 'bar', 'the views elementId property is set');
+  });
+
+  QUnit.test('Specifying `id` to {{view}} does not allow bound id changes.', function() {
+    registry.register('view:derp', EmberView['default'].extend({
+      template: compile['default']('<div id="view-id">{{view.id}}</div><div id="view-elementId">{{view.elementId}}</div>')
+    }));
+
+    view = EmberView['default'].create({
+      container: container,
+      foo: 'bar',
+      template: compile['default']('{{view "derp" id=view.foo}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$('#view-id').text(), 'bar', 'the views id property is set');
+
+    run['default'](view, property_set.set, view, 'foo', 'baz');
+
+    equal(view.$('#view-id').text(), 'bar', 'the views id property is not changed');
+  });
+
 });
 enifed('ember-htmlbars/tests/helpers/view_test.jscs-test', function () {
 
@@ -14464,7 +14792,7 @@ enifed('ember-htmlbars/tests/helpers/yield_test', ['ember-metal/run_loop', 'embe
 
     view = EmberView['default'].create({
       controller: { boundText: "outer", component: component },
-      template: compile['default']('{{#with boundText as item}}{{#view component contentBinding="item"}}{{item}}{{/view}}{{/with}}')
+      template: compile['default']('{{#with boundText as item}}{{#view component content=item}}{{item}}{{/view}}{{/with}}')
     });
 
     utils.runAppend(view);
@@ -15594,7 +15922,7 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
     }
   });
 
-  QUnit.test("works from a template with bindings", function() {
+  QUnit.test("works from a template with bindings [DEPRECATED]", function() {
     var Person = EmberObject['default'].extend({
       id: null,
       firstName: null,
@@ -15635,6 +15963,70 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
       )
     });
 
+    expectDeprecation(function() {
+      utils.runAppend(view);
+    }, /You're attempting to render a view by passing .+Binding to a view helper, but this syntax is deprecated/);
+
+    var select = view.get('select');
+    ok(select.$().length, "Select was rendered");
+    equal(select.$('option').length, 5, "Options were rendered");
+    equal(select.$().text(), "Pick a person:Yehuda KatzTom DalePeter WagenetErik Bryn\n", "Option values were rendered");
+    equal(select.get('selection'), null, "Nothing has been selected");
+
+    run['default'](function() {
+      application.selectedPersonController.set('person', erik);
+    });
+
+    equal(select.get('selection'), erik, "Selection was updated through binding");
+    run['default'](function() {
+      application.peopleController.pushObject(Person.create({ id: 5, firstName: "James", lastName: "Rosen" }));
+    });
+
+    equal(select.$('option').length, 6, "New option was added");
+    equal(select.get('selection'), erik, "Selection was maintained after new option was added");
+  });
+
+  QUnit.test("works from a template", function() {
+    var Person = EmberObject['default'].extend({
+      id: null,
+      firstName: null,
+      lastName: null,
+
+      fullName: computed.computed(function() {
+        return this.get('firstName') + " " + this.get('lastName');
+      }).property('firstName', 'lastName')
+    });
+
+    var erik = Person.create({ id: 4, firstName: 'Erik', lastName: 'Bryn' });
+
+    var application = Namespace['default'].create();
+
+    application.peopleController = ArrayController['default'].create({
+      content: Ember.A([
+        Person.create({ id: 1, firstName: 'Yehuda', lastName: 'Katz' }),
+        Person.create({ id: 2, firstName: 'Tom', lastName: 'Dale' }),
+        Person.create({ id: 3, firstName: 'Peter', lastName: 'Wagenet' }),
+        erik
+      ])
+    });
+
+    application.selectedPersonController = EmberObject['default'].create({
+      person: null
+    });
+
+    view = EmberView['default'].create({
+      app: application,
+      selectView: SelectView['default'],
+      template: compile['default'](
+        '{{view view.selectView viewName="select"' +
+        '    content=view.app.peopleController' +
+        '    optionLabelPath="content.fullName"' +
+        '    optionValuePath="content.id"' +
+        '    prompt="Pick a person:"' +
+        '    selection=view.app.selectedPersonController.person}}'
+      )
+    });
+
     utils.runAppend(view);
 
     var select = view.get('select');
@@ -15665,8 +16057,8 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
       selectView: SelectView['default'],
       template: compile['default'](
         '{{view view.selectView viewName="select"' +
-        '    contentBinding="view.user.options"' +
-        '    selectionBinding="view.user.selectedOption"}}'
+        '    content=view.user.options' +
+        '    selection=view.user.selectedOption}}'
       )
     });
 
@@ -15700,8 +16092,8 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
       selectView: SelectView['default'],
       template: compile['default'](
         '{{view view.selectView viewName="select"' +
-        '    contentBinding="view.proxy"' +
-        '    selectionBinding="view.proxy.selectedOption"}}'
+        '    content=view.proxy' +
+        '    selection=view.proxy.selectedOption}}'
       )
     });
 
@@ -15746,7 +16138,9 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
     equal(selectEl.selectedIndex, 1, "The DOM is updated to reflect the new selection");
   }
 
-  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using valueBinding (old xBinding='' syntax)", function() {
+  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using valueBinding [DEPRECATED]", function() {
+    expectDeprecation(/You're attempting to render a view by passing .+Binding to a view helper, but this syntax is deprecated./);
+
     testValueBinding(
       '{{view view.selectView viewName="select"' +
       '    contentBinding="view.collection"' +
@@ -15757,7 +16151,7 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
     );
   });
 
-  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using valueBinding (new quoteless binding shorthand)", function() {
+  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using a bound value", function() {
     testValueBinding(
       '{{view view.selectView viewName="select"' +
       '    content=view.collection' +
@@ -15796,7 +16190,9 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
     equal(select.$('option:eq(1)').prop('selected'), true, "Selected property is set to proper option");
   }
 
-  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using selectionBinding (old xBinding='' syntax)", function() {
+  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using selectionBinding [DEPRECATED]", function() {
+    expectDeprecation(/You're attempting to render a view by passing .+Binding to a view helper, but this syntax is deprecated./);
+
     testSelectionBinding(
       '{{view view.selectView viewName="select"' +
       '    contentBinding="view.collection"' +
@@ -15807,7 +16203,7 @@ enifed('ember-htmlbars/tests/integration/select_in_template_test', ['ember-runti
     );
   });
 
-  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using selectionBinding (new quoteless binding shorthand)", function() {
+  QUnit.test("select element should correctly initialize and update selectedIndex and bound properties when using a bound selection", function() {
     testSelectionBinding(
       '{{view view.selectView viewName="select"' +
       '    content=view.collection' +
@@ -16961,7 +17357,7 @@ enifed('ember-htmlbars/tests/system/render_view_test', ['ember-runtime/tests/uti
     view = EmberView['default'].create({
       template: {
         isHTMLBars: true,
-        revision: 'Ember@1.11.0-beta.5.1501308c',
+        revision: 'Ember@1.11.0',
         render: function(view, env, contextualElement, blockArguments) {
           for (var i = 0, l = keyNames.length; i < l; i++) {
             var keyName = keyNames[i];
@@ -30905,6 +31301,26 @@ enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core',
     }, "The second argument of {{render}} must be a path, e.g. {{render \"post\" post}}.");
   });
 
+  QUnit.test("{{render}} helper should let view provide its own template", function() {
+    var template = "{{render 'fish'}}";
+    var controller = controllers__controller["default"].extend({ container: container });
+    view = EmberView['default'].create({
+      controller: controller.create(),
+      template: compile['default'](template)
+    });
+
+    container._registry.register('template:fish', compile['default']('Hello fish!'));
+    container._registry.register('template:other', compile['default']('Hello other!'));
+
+    container._registry.register('view:fish', EmberView['default'].extend({
+      templateName: 'other'
+    }));
+
+    tests__utils.runAppend(view);
+
+    equal(view.$().text(), 'Hello other!');
+  });
+
 });
 enifed('ember-routing-htmlbars/tests/helpers/render_test.jscs-test', function () {
 
@@ -31838,14 +32254,14 @@ enifed('ember-routing/tests/location/hash_location_test', ['ember-metal/core', '
     var pathname = (tmp.pathname.match(/^\//)) ? tmp.pathname : '/' + tmp.pathname;
 
     return {
-        hash: tmp.hash,
-        host: tmp.host || 'localhost',
-        hostname: tmp.hostname || 'localhost',
-        href: tmp.href,
-        pathname: pathname,
-        port: tmp.port || '',
-        protocol: protocol,
-        search: tmp.search
+      hash: tmp.hash,
+      host: tmp.host || 'localhost',
+      hostname: tmp.hostname || 'localhost',
+      href: tmp.href,
+      pathname: pathname,
+      port: tmp.port || '',
+      protocol: protocol,
+      search: tmp.search
     };
   }
 
@@ -32044,14 +32460,14 @@ enifed('ember-routing/tests/location/history_location_test', ['ember-metal/prope
     var pathname = (tmp.pathname.match(/^\//)) ? tmp.pathname : '/' + tmp.pathname;
 
     return {
-        hash: tmp.hash,
-        host: tmp.host || 'localhost',
-        hostname: tmp.hostname || 'localhost',
-        href: tmp.href,
-        pathname: pathname,
-        port: tmp.port || '',
-        protocol: protocol,
-        search: tmp.search
+      hash: tmp.hash,
+      host: tmp.host || 'localhost',
+      hostname: tmp.hostname || 'localhost',
+      href: tmp.href,
+      pathname: pathname,
+      port: tmp.port || '',
+      protocol: protocol,
+      search: tmp.search
     };
   }
 
@@ -32494,8 +32910,8 @@ enifed('ember-routing/tests/system/dsl_test', ['ember-routing/system/router', 'e
     ok(router.router.recognizer.names['bleep.bloop.blork'], 'parent name was used as base of nested routes');
   });
 
-  
   // jscs:disable validateIndentation
+  
 
   QUnit.test("should add loading and error routes if _isRouterMapResult is true", function() {
     Router.map(function() {
@@ -32523,8 +32939,8 @@ enifed('ember-routing/tests/system/dsl_test', ['ember-routing/system/router', 'e
     ok(!router.router.recognizer.names['blork_error'], 'error route was not added');
   });
 
-  // jscs:enable validateIndentation
   
+  // jscs:enable validateIndentation
 
 });
 enifed('ember-routing/tests/system/dsl_test.jscs-test', function () {
@@ -34650,18 +35066,18 @@ enifed('ember-runtime/tests/computed/reduce_computed_macros_test', ['ember-metal
   QUnit.test("it throws an error if given fewer or more than two dependent properties", function() {
     throws(function () {
       EmberObject['default'].createWithMixins({
-          array: Ember['default'].A([1,2,3,4,5,6,7]),
-          array2: Ember['default'].A([3,4,5]),
-          diff: reduce_computed_macros.setDiff('array')
+        array: Ember['default'].A([1,2,3,4,5,6,7]),
+        array2: Ember['default'].A([3,4,5]),
+        diff: reduce_computed_macros.setDiff('array')
       });
     }, /requires exactly two dependent arrays/, "setDiff requires two dependent arrays");
 
     throws(function () {
       EmberObject['default'].createWithMixins({
-          array: Ember['default'].A([1,2,3,4,5,6,7]),
-          array2: Ember['default'].A([3,4,5]),
-          array3: Ember['default'].A([7]),
-          diff: reduce_computed_macros.setDiff('array', 'array2', 'array3')
+        array: Ember['default'].A([1,2,3,4,5,6,7]),
+        array2: Ember['default'].A([3,4,5]),
+        array3: Ember['default'].A([7]),
+        diff: reduce_computed_macros.setDiff('array', 'array2', 'array3')
       });
     }, /requires exactly two dependent arrays/, "setDiff requires two dependent arrays");
   });
@@ -35688,7 +36104,7 @@ enifed('ember-runtime/tests/computed/reduce_computed_test', ['ember-metal/core',
 
   QUnit.test("after the first retrieval, array computed properties observe additions to dependent arrays", function() {
     var numbers = property_get.get(obj, 'numbers');
-        // set up observers
+    // set up observers
     var evenNumbers = property_get.get(obj, 'evenNumbers');
 
     run['default'](function() {
@@ -35700,7 +36116,7 @@ enifed('ember-runtime/tests/computed/reduce_computed_test', ['ember-metal/core',
 
   QUnit.test("after the first retrieval, array computed properties observe removals from dependent arrays", function() {
     var numbers = property_get.get(obj, 'numbers');
-        // set up observers
+    // set up observers
     var evenNumbers = property_get.get(obj, 'evenNumbers');
 
     run['default'](function() {
@@ -36619,7 +37035,7 @@ enifed('ember-runtime/tests/computed/reduce_computed_test.jshint', function () {
   });
 
 });
-enifed('ember-runtime/tests/controllers/array_controller_test', ['ember-metal/core', 'ember-runtime/tests/suites/mutable_array', 'ember-runtime/controllers/array_controller'], function (Ember, MutableArrayTests, ArrayController) {
+enifed('ember-runtime/tests/controllers/array_controller_test', ['ember-metal/core', 'ember-runtime/tests/suites/mutable_array', 'ember-runtime/controllers/array_controller', 'ember-metal/property_set', 'ember-metal/property_get'], function (Ember, MutableArrayTests, ArrayController, property_set, property_get) {
 
   'use strict';
 
@@ -36644,6 +37060,8 @@ enifed('ember-runtime/tests/controllers/array_controller_test', ['ember-metal/co
     }
   }).run();
 
+  QUnit.module("ember-runtime: array_controller");
+
   QUnit.test("defaults its `model` to an empty array", function () {
     var Controller = ArrayController['default'].extend();
     deepEqual(Controller.create().get("model"), [], "`ArrayController` defaults its model to an empty array");
@@ -36651,13 +37069,34 @@ enifed('ember-runtime/tests/controllers/array_controller_test', ['ember-metal/co
     equal(Controller.create().get('lastObject'), undefined, 'can fetch lastObject');
   });
 
-
   QUnit.test("Ember.ArrayController length property works even if model was not set initially", function() {
     var controller = ArrayController['default'].create();
     controller.pushObject('item');
     equal(controller.get('length'), 1);
   });
 
+  QUnit.test('works properly when model is set to an Ember.A()', function() {
+    var controller = ArrayController['default'].create();
+
+    property_set.set(controller, 'model', Ember['default'].A(['red', 'green']));
+
+    deepEqual(property_get.get(controller, 'model'), ['red', 'green'], "can set model as an Ember.Array");
+  });
+
+  QUnit.test('works properly when model is set to a plain array', function() {
+    var controller = ArrayController['default'].create();
+
+    if (Ember['default'].EXTEND_PROTOTYPES) {
+      property_set.set(controller, 'model', ['red', 'green']);
+
+      deepEqual(property_get.get(controller, 'model'), ['red', 'green'], "can set model as a plain array");
+    } else {
+      expectAssertion(function() {
+        property_set.set(controller, 'model', ['red', 'green']);
+      }, /ArrayController expects `model` to implement the Ember.Array mixin. This can often be fixed by wrapping your model with `Ember\.A\(\)`./);
+    }
+  });
+
 });
 enifed('ember-runtime/tests/controllers/array_controller_test.jscs-test', function () {
 
@@ -36679,7 +37118,7 @@ enifed('ember-runtime/tests/controllers/array_controller_test.jshint', function
   });
 
 });
-enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/controllers/controller', 'ember-runtime/system/service', 'ember-runtime/controllers/object_controller', 'ember-metal/mixin', 'ember-runtime/system/object', 'ember-runtime/system/container', 'ember-runtime/inject', 'ember-metal/property_get'], function (Controller, Service, object_controller, Mixin, Object, system__container, inject, property_get) {
+enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/controllers/controller', 'ember-runtime/system/service', 'ember-runtime/controllers/array_controller', 'ember-runtime/controllers/object_controller', 'ember-metal/mixin', 'ember-runtime/system/object', 'ember-runtime/system/container', 'ember-runtime/inject', 'ember-metal/property_get'], function (Controller, Service, ArrayController, object_controller, Mixin, Object, system__container, inject, property_get) {
 
   'use strict';
 
@@ -36895,6 +37334,42 @@ enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/contro
     equal(postsController, postController.get('postsController'), "controller.posts is injected");
   });
 
+  QUnit.test("controllers can be injected into ObjectControllers", function() {
+    var registry = new system__container.Registry();
+    var container = registry.container();
+
+    registry.register('controller:post', Controller['default'].extend({
+      postsController: inject['default'].controller('posts')
+    }));
+
+    registry.register('controller:posts', object_controller["default"].extend());
+
+    var postController = container.lookup('controller:post');
+    var postsController;
+    expectDeprecation(function() {
+      postsController = container.lookup('controller:posts');
+    }, object_controller.objectControllerDeprecation);
+
+    equal(postsController, postController.get('postsController'), "controller.posts is injected");
+  });
+
+  QUnit.test("controllers can be injected into ArrayControllers", function() {
+    var registry = new system__container.Registry();
+    var container = registry.container();
+
+    registry.register('controller:post', Controller['default'].extend({
+      postsController: inject['default'].controller('posts')
+    }));
+
+    registry.register('controller:posts', ArrayController['default'].extend());
+
+    var postController = container.lookup('controller:post');
+    var postsController = container.lookup('controller:posts');
+
+    equal(postsController, postController.get('postsController'), "controller.posts is injected");
+  });
+
+
   QUnit.test("services can be injected into controllers", function() {
     var registry = new system__container.Registry();
     var container = registry.container();
@@ -39349,7 +39824,7 @@ enifed('ember-runtime/tests/legacy_1x/mixins/observable/propertyChanges_test', [
     equal(ObjectA.prop, "propValue");
     ObjectA.endPropertyChanges();
 
-      //end inner nest
+    //end inner nest
     ObjectA.set('prop', 'changePropValue');
     equal(ObjectA.newFoo, "newFooValue");
 
@@ -39686,9 +40161,9 @@ enifed('ember-runtime/tests/legacy_1x/system/binding_test', ['ember-metal/core',
         });
 
         TestNamespace.toObject = EmberObject['default'].createWithMixins({
-            valueBinding: ember_metal__binding.Binding.from('TestNamespace.fromObject.value'),
-            localValue: "originalLocal",
-            relativeBinding: ember_metal__binding.Binding.from('localValue')
+          valueBinding: ember_metal__binding.Binding.from('TestNamespace.fromObject.value'),
+          localValue: "originalLocal",
+          relativeBinding: ember_metal__binding.Binding.from('localValue')
         });
       });
     },
@@ -39994,7 +40469,7 @@ enifed('ember-runtime/tests/legacy_1x/system/object/bindings_test', ['ember-meta
     teardown: function() {
       Ember['default'].lookup = originalLookup;
       TestObject = fromObject = extraObject = null;
-    //  delete TestNamespace;
+      //  delete TestNamespace;
     }
 
   };
@@ -40571,8 +41046,8 @@ enifed('ember-runtime/tests/legacy_1x/system/set_test', ['ember-metal/core', 'em
   });
 
   QUnit.module("Set.pop + Set.copy", {
-  // generate a set with every type of object, but none of the specific
-  // ones we add in the tests below...
+    // generate a set with every type of object, but none of the specific
+    // ones we add in the tests below...
     setup: function() {
       ignoreDeprecation(function() {
         set = new Set['default'](Ember['default'].A([
@@ -43204,8 +43679,7 @@ enifed('ember-runtime/tests/suites/array', ['exports', 'ember-runtime/tests/suit
   'use strict';
 
   var ObserverClass = enumerable.ObserverClass.extend({
-
-     observeArray: function(obj) {
+    observeArray: function(obj) {
       obj.addArrayObserver(this);
       return this;
     },
@@ -52187,7 +52661,7 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
 
     var actual = compile['default'](templateString);
 
-    equal(actual.revision, 'Ember@1.11.0-beta.5.1501308c', 'revision is included in generated template');
+    equal(actual.revision, 'Ember@1.11.0', 'revision is included in generated template');
   });
 
   QUnit.test('the template revision is different than the HTMLBars default revision', function() {
@@ -52423,7 +52897,7 @@ enifed('ember-testing/test.jshint', function () {
   });
 
 });
-enifed('ember-testing/tests/acceptance_test', ['ember-metal/run_loop', 'ember-views/system/jquery', 'ember-testing/test', 'ember-testing/adapters/qunit', 'ember-views/views/view', 'ember-testing/initializers', 'ember-application/system/application', 'ember-routing/system/route', 'ember-template-compiler/system/compile', 'ember-routing'], function (run, jQuery, Test, QUnitAdapter, EmberView, __dep5__, EmberApplication, EmberRoute, compile) {
+enifed('ember-testing/tests/acceptance_test', ['ember-metal/run_loop', 'ember-views/system/jquery', 'ember-testing/test', 'ember-testing/adapters/qunit', 'ember-views/views/view', 'ember-testing/initializers', 'ember-application/system/application', 'ember-routing/system/route', 'ember-template-compiler/system/compile', 'ember-runtime/ext/rsvp', 'ember-routing'], function (run, jQuery, Test, QUnitAdapter, EmberView, __dep5__, EmberApplication, EmberRoute, compile, RSVP) {
 
   'use strict';
 
@@ -52486,7 +52960,7 @@ enifed('ember-testing/tests/acceptance_test', ['ember-metal/run_loop', 'ember-vi
       });
 
       Test['default'].registerAsyncHelper('slowHelper', function() {
-        return Test['default'].promise(function(resolve) {
+        return new RSVP['default'].Promise(function(resolve) {
           setTimeout(resolve, 10);
         });
       });
@@ -54786,26 +55260,6 @@ enifed('ember-views/system/renderer.jshint', function () {
     ok(true, 'ember-views/system/renderer.js should pass jshint.'); 
   });
 
-});
-enifed('ember-views/system/sanitize_attribute_value.jscs-test', function () {
-
-  'use strict';
-
-  module('JSCS - ember-views/system');
-  test('ember-views/system/sanitize_attribute_value.js should pass jscs', function() {
-    ok(true, 'ember-views/system/sanitize_attribute_value.js should pass jscs.');
-  });
-
-});
-enifed('ember-views/system/sanitize_attribute_value.jshint', function () {
-
-  'use strict';
-
-  module('JSHint - ember-views/system');
-  test('ember-views/system/sanitize_attribute_value.js should pass jshint', function() { 
-    ok(true, 'ember-views/system/sanitize_attribute_value.js should pass jshint.'); 
-  });
-
 });
 enifed('ember-views/system/utils.jscs-test', function () {
 
@@ -55936,84 +56390,6 @@ enifed('ember-views/tests/system/render_buffer_test.jshint', function () {
     ok(true, 'ember-views/tests/system/render_buffer_test.js should pass jshint.'); 
   });
 
-});
-enifed('ember-views/tests/system/sanitize_attribute_value_test', ['ember-views/system/sanitize_attribute_value', 'ember-htmlbars/utils/string', 'dom-helper'], function (sanitizeAttributeValue, string, DOMHelper) {
-
-  'use strict';
-
-  QUnit.module('ember-views: sanitizeAttributeValue(null, "href")');
-
-  var goodProtocols = ['https', 'http', 'ftp', 'tel', 'file'];
-  var dom = new DOMHelper['default']();
-
-  for (var i = 0, l = goodProtocols.length; i < l; i++) {
-    buildProtocolTest(goodProtocols[i]);
-  }
-
-  function buildProtocolTest(protocol) {
-    QUnit.test('allows ' + protocol + ' protocol when element is not provided', function() {
-      expect(1);
-
-      var expected = protocol + '://foo.com';
-      var actual = sanitizeAttributeValue['default'](dom, null, 'href', expected);
-
-      equal(actual, expected, 'protocol not escaped');
-    });
-  }
-
-  QUnit.test('blocks javascript: protocol', function() {
-    /* jshint scripturl:true */
-
-    expect(1);
-
-    var expected = 'javascript:alert("foo")';
-    var actual = sanitizeAttributeValue['default'](dom, null, 'href', expected);
-
-    equal(actual, 'unsafe:' + expected, 'protocol escaped');
-  });
-
-  QUnit.test('blocks blacklisted protocols', function() {
-    /* jshint scripturl:true */
-
-    expect(1);
-
-    var expected = 'javascript:alert("foo")';
-    var actual = sanitizeAttributeValue['default'](dom, null, 'href', expected);
-
-    equal(actual, 'unsafe:' + expected, 'protocol escaped');
-  });
-
-  QUnit.test('does not block SafeStrings', function() {
-    /* jshint scripturl:true */
-
-    expect(1);
-
-    var expected = 'javascript:alert("foo")';
-    var actual = sanitizeAttributeValue['default'](dom, null, 'href', new string.SafeString(expected));
-
-    equal(actual, expected, 'protocol unescaped');
-  });
-
-});
-enifed('ember-views/tests/system/sanitize_attribute_value_test.jscs-test', function () {
-
-  'use strict';
-
-  module('JSCS - ember-views/tests/system');
-  test('ember-views/tests/system/sanitize_attribute_value_test.js should pass jscs', function() {
-    ok(true, 'ember-views/tests/system/sanitize_attribute_value_test.js should pass jscs.');
-  });
-
-});
-enifed('ember-views/tests/system/sanitize_attribute_value_test.jshint', function () {
-
-  'use strict';
-
-  module('JSHint - ember-views/tests/system');
-  test('ember-views/tests/system/sanitize_attribute_value_test.js should pass jshint', function() { 
-    ok(true, 'ember-views/tests/system/sanitize_attribute_value_test.js should pass jshint.'); 
-  });
-
 });
 enifed('ember-views/tests/system/view_utils_test', ['ember-metal/run_loop', 'ember-views/views/view'], function (run, View) {
 
@@ -56868,10 +57244,10 @@ enifed('ember-views/tests/views/collection_test', ['ember-metal/core', 'ember-me
     Ember['default'].lookup = {
       App: {
         EmptyView: View['default'].extend({
-        tagName: 'kbd',
-        render: function(buf) {
-          buf.push("THIS IS AN EMPTY VIEW");
-        }
+          tagName: 'kbd',
+          render: function(buf) {
+            buf.push("THIS IS AN EMPTY VIEW");
+          }
         })
       }
     };
@@ -62224,7 +62600,7 @@ enifed('ember-views/tests/views/view/inject_test.jshint', function () {
   });
 
 });
-enifed('ember-views/tests/views/view/is_visible_test', ['ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/run_loop', 'ember-views/views/view', 'ember-views/views/container_view'], function (property_get, property_set, run, EmberView, ContainerView) {
+enifed('ember-views/tests/views/view/is_visible_test', ['ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/run_loop', 'ember-views/views/view', 'ember-views/views/container_view', 'ember-template-compiler/system/compile'], function (property_get, property_set, run, EmberView, ContainerView, compile) {
 
   'use strict';
 
@@ -62350,8 +62726,28 @@ enifed('ember-views/tests/views/view/is_visible_test', ['ember-metal/property_ge
   });
 
   QUnit.test("view should be notified after isVisible is set to false and the element has been hidden", function() {
-    view = View.create({ isVisible: true });
-    var childView = view.get('childViews').objectAt(0);
+    run['default'](function() {
+      view = View.create({ isVisible: false });
+      view.append();
+    });
+
+    ok(view.$().is(':hidden'), "precond - view is hidden when appended");
+
+    run['default'](function() {
+      view.set('isVisible', true);
+    });
+
+    ok(view.$().is(':visible'), "precond - view is now visible");
+    equal(parentBecameVisible, 1);
+    equal(childBecameVisible, 1);
+    equal(grandchildBecameVisible, 1);
+  });
+
+  QUnit.test("view should change visibility with a virtual childView", function() {
+    view = View.create({
+      isVisible: true,
+      template: compile['default']('<div {{bind-attr bing="tweep"}}></div>')
+    });
 
     run['default'](function() {
       view.append();
@@ -62360,13 +62756,10 @@ enifed('ember-views/tests/views/view/is_visible_test', ['ember-metal/property_ge
     ok(view.$().is(':visible'), "precond - view is visible when appended");
 
     run['default'](function() {
-      childView.set('isVisible', false);
+      view.set('isVisible', false);
     });
 
-    ok(childView.$().is(':hidden'), "precond - view is now hidden");
-
-    equal(childBecameHidden, 1);
-    equal(grandchildBecameHidden, 1);
+    ok(view.$().is(':hidden'), "precond - view is now hidden");
   });
 
   QUnit.test("view should be notified after isVisible is set to true and the element has been shown", function() {
@@ -65517,7 +65910,7 @@ enifed('ember/tests/helpers/helper_registration_test', ['ember', 'ember-htmlbars
     ok(!helpers['x-borf'], "Container-registered helper doesn't wind up on global helpers hash");
   });
 
-    // need to make `makeBoundHelper` for HTMLBars
+  // need to make `makeBoundHelper` for HTMLBars
   QUnit.test("Bound helpers registered on the container can be late-invoked", function() {
     Ember.TEMPLATES.application = compile("<div id='wrapper'>{{x-reverse}} {{x-reverse foo}}</div>");
 
@@ -65532,8 +65925,8 @@ enifed('ember/tests/helpers/helper_registration_test', ['ember', 'ember-htmlbars
     ok(!helpers['x-reverse'], "Container-registered helper doesn't wind up on global helpers hash");
   });
 
-    // we have unit tests for this in ember-htmlbars/tests/system/lookup-helper
-    // and we are not going to recreate the handlebars helperMissing concept
+  // we have unit tests for this in ember-htmlbars/tests/system/lookup-helper
+  // and we are not going to recreate the handlebars helperMissing concept
   QUnit.test("Undashed helpers registered on the container can not (presently) be invoked", function() {
 
     // Note: the reason we're not allowing undashed helpers is to avoid
@@ -67224,7 +67617,7 @@ enifed('ember/tests/helpers/link_to_test', ['ember', 'ember-runtime/controllers/
     equal(router.get('location.path'), '/about');
   }
 
-  var aboutDefer;
+  var aboutDefer, otherDefer;
 
   if (!Ember.FEATURES.isEnabled('ember-routing-transitioning-classes')) {
     QUnit.module("The {{link-to}} helper: eager URL updating", {
@@ -67362,12 +67755,20 @@ enifed('ember/tests/helpers/link_to_test', ['ember', 'ember-runtime/controllers/
           });
 
           App.AboutRoute = Ember.Route.extend({
-            model: function() {
+            model: function () {
               aboutDefer = Ember.RSVP.defer();
               return aboutDefer.promise;
             }
           });
 
+          App.OtherRoute = Ember.Route.extend({
+            model: function () {
+              otherDefer = Ember.RSVP.defer();
+              return otherDefer.promise;
+            }
+          });
+
+
           Ember.TEMPLATES.application = compile("{{outlet}}{{link-to 'Index' 'index' id='index-link'}}{{link-to 'About' 'about' id='about-link'}}{{link-to 'Other' 'other' id='other-link'}}");
         });
       },
@@ -67408,6 +67809,85 @@ enifed('ember/tests/helpers/link_to_test', ['ember', 'ember-runtime/controllers/
       assertHasClass('ember-transitioning-in', $index, false, $about, false, $other, false);
       assertHasClass('ember-transitioning-out', $index, false, $about, false, $other, false);
     });
+
+    QUnit.test("while a transition is underway with nested link-to's", function() {
+      expect(54);
+
+      Router.map(function() {
+        this.route('parent-route', function() {
+          this.route('about');
+          this.route('other');
+        });
+      });
+
+      App.ParentRouteAboutRoute = Ember.Route.extend({
+        model: function () {
+          aboutDefer = Ember.RSVP.defer();
+          return aboutDefer.promise;
+        }
+      });
+
+      App.ParentRouteOtherRoute = Ember.Route.extend({
+        model: function () {
+          otherDefer = Ember.RSVP.defer();
+          return otherDefer.promise;
+        }
+      });
+
+      Ember.TEMPLATES.application = compile("{{outlet}} {{#link-to 'index' tagName='li'}} {{link-to 'Index' 'index' id='index-link'}} {{/link-to}} {{#link-to 'parent-route.about' tagName='li'}} {{link-to 'About' 'parent-route.about' id='about-link'}} {{/link-to}} {{#link-to 'parent-route.other' tagName='li'}} {{link-to 'Other' 'parent-route.other' id='other-link'}} {{/link-to}}");
+
+      bootApplication();
+
+      function assertHasClass(className) {
+        var i = 1;
+        while (i < arguments.length) {
+          var $a = arguments[i];
+          var shouldHaveClass = arguments[i+1];
+          equal($a.hasClass(className), shouldHaveClass, $a.attr('id') + " should " + (shouldHaveClass ? '' : "not ") + "have class " + className);
+          i +=2;
+        }
+      }
+
+      var $index = Ember.$('#index-link');
+      var $about = Ember.$('#about-link');
+      var $other = Ember.$('#other-link');
+
+      Ember.run($about, 'click');
+
+      assertHasClass('active', $index, true, $about, false, $other, false);
+      assertHasClass('ember-transitioning-in', $index, false, $about, true, $other, false);
+      assertHasClass('ember-transitioning-out', $index, true, $about, false, $other, false);
+
+      Ember.run(aboutDefer, 'resolve');
+
+      assertHasClass('active', $index, false, $about, true, $other, false);
+      assertHasClass('ember-transitioning-in', $index, false, $about, false, $other, false);
+      assertHasClass('ember-transitioning-out', $index, false, $about, false, $other, false);
+
+      Ember.run($other, 'click');
+
+      assertHasClass('active', $index, false, $about, true, $other, false);
+      assertHasClass('ember-transitioning-in', $index, false, $about, false, $other, true);
+      assertHasClass('ember-transitioning-out', $index, false, $about, true, $other, false);
+
+      Ember.run(otherDefer, 'resolve');
+
+      assertHasClass('active', $index, false, $about, false, $other, true);
+      assertHasClass('ember-transitioning-in', $index, false, $about, false, $other, false);
+      assertHasClass('ember-transitioning-out', $index, false, $about, false, $other, false);
+
+      Ember.run($about, 'click');
+
+      assertHasClass('active', $index, false, $about, false, $other, true);
+      assertHasClass('ember-transitioning-in', $index, false, $about, true, $other, false);
+      assertHasClass('ember-transitioning-out', $index, false, $about, false, $other, true);
+
+      Ember.run(aboutDefer, 'resolve');
+
+      assertHasClass('active', $index, false, $about, true, $other, false);
+      assertHasClass('ember-transitioning-in', $index, false, $about, false, $other, false);
+      assertHasClass('ember-transitioning-out', $index, false, $about, false, $other, false);
+    });
   
 
 });
@@ -67537,6 +68017,8 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
 
   'use strict';
 
+  var trim = Ember.$.trim;
+
   var compile = EmberHandlebars['default'].compile;
 
   var Router, App, router, registry, container, originalLoggerError;
@@ -71139,6 +71621,247 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
     equal(Ember.$('#qunit-fixture').text(), "A-The index-B-Hello world-C", "second render");
   });
 
+  QUnit.test("Can render routes with no 'main' outlet and their children", function() {
+    Ember.TEMPLATES.application = compile('<div id="application">{{outlet "app"}}</div>');
+    Ember.TEMPLATES.app = compile('<div id="app-common">{{outlet "common"}}</div><div id="app-sub">{{outlet "sub"}}</div>');
+    Ember.TEMPLATES.common = compile('<div id="common"></div>');
+    Ember.TEMPLATES.sub = compile('<div id="sub"></div>');
+
+    Router.map(function() {
+      this.route('app', { path: "/app" }, function() {
+        this.resource('sub', { path: "/sub" });
+      });
+    });
+
+    App.AppRoute = Ember.Route.extend({
+      renderTemplate : function() {
+        this.render('app', {
+          outlet: 'app',
+          into: 'application'
+        });
+        this.render('common', {
+          outlet: 'common',
+          into: 'app'
+        });
+      }
+    });
+
+    App.SubRoute = Ember.Route.extend({
+      renderTemplate : function() {
+        this.render('sub', {
+          outlet: 'sub',
+          into: 'app'
+        });
+      }
+    });
+
+    bootApplication();
+    handleURL('/app');
+    equal(Ember.$('#app-common #common').length, 1, "Finds common while viewing /app");
+    handleURL('/app/sub');
+    equal(Ember.$('#app-common #common').length, 1, "Finds common while viewing /app/sub");
+    equal(Ember.$('#app-sub #sub').length, 1, "Finds sub while viewing /app/sub");
+  });
+
+  QUnit.test("Tolerates stacked renders", function() {
+    Ember.TEMPLATES.application = compile('{{outlet}}{{outlet "modal"}}');
+    Ember.TEMPLATES.index = compile('hi');
+    Ember.TEMPLATES.layer = compile('layer');
+    App.ApplicationRoute = Ember.Route.extend({
+      actions: {
+        openLayer: function() {
+          this.render('layer', {
+            into: 'application',
+            outlet: 'modal'
+          });
+        },
+        close: function() {
+          this.disconnectOutlet({
+            outlet: 'modal',
+            parentView: 'application'
+          });
+        }
+      }
+    });
+    bootApplication();
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
+    Ember.run(router, 'send', 'openLayer');
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hilayer');
+    Ember.run(router, 'send', 'openLayer');
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hilayer');
+    Ember.run(router, 'send', 'close');
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
+  });
+
+  QUnit.test("Renders child into parent with non-default template name", function() {
+    Ember.TEMPLATES.application = compile('<div class="a">{{outlet}}</div>');
+    Ember.TEMPLATES['exports/root'] = compile('<div class="b">{{outlet}}</div>');
+    Ember.TEMPLATES['exports/index'] = compile('<div class="c"></div>');
+
+    Router.map(function() {
+      this.route('root', function() {
+      });
+    });
+
+    App.RootRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render('exports/root');
+      }
+    });
+
+    App.RootIndexRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render('exports/index');
+      }
+    });
+
+    bootApplication();
+    handleURL('/root');
+    equal(Ember.$('#qunit-fixture .a .b .c').length, 1);
+  });
+
+  QUnit.test("Allows any route to disconnectOutlet another route's templates", function() {
+    Ember.TEMPLATES.application = compile('{{outlet}}{{outlet "modal"}}');
+    Ember.TEMPLATES.index = compile('hi');
+    Ember.TEMPLATES.layer = compile('layer');
+    App.ApplicationRoute = Ember.Route.extend({
+      actions: {
+        openLayer: function() {
+          this.render('layer', {
+            into: 'application',
+            outlet: 'modal'
+          });
+        }
+      }
+    });
+    App.IndexRoute = Ember.Route.extend({
+      actions: {
+        close: function() {
+          this.disconnectOutlet({
+            parentView: 'application',
+            outlet: 'modal'
+          });
+        }
+      }
+    });
+    bootApplication();
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
+    Ember.run(router, 'send', 'openLayer');
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hilayer');
+    Ember.run(router, 'send', 'close');
+    equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
+  });
+
+  QUnit.test("Can render({into:...}) the render helper", function() {
+    Ember.TEMPLATES.application = compile('{{render "foo"}}');
+    Ember.TEMPLATES.foo = compile('<div class="foo">{{outlet}}</div>');
+    Ember.TEMPLATES.index = compile('other');
+    Ember.TEMPLATES.bar = compile('bar');
+
+    App.IndexRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render({ into: 'foo' });
+      },
+      actions: {
+        changeToBar: function() {
+          this.disconnectOutlet({
+            parentView: 'foo',
+            outlet: 'main'
+          });
+          this.render('bar', { into: 'foo' });
+        }
+      }
+    });
+
+    bootApplication();
+    equal(Ember.$('#qunit-fixture .foo').text(), 'other');
+    Ember.run(router, 'send', 'changeToBar');
+    equal(Ember.$('#qunit-fixture .foo').text(), 'bar');
+  });
+
+  QUnit.test("Can disconnect from the render helper", function() {
+    Ember.TEMPLATES.application = compile('{{render "foo"}}');
+    Ember.TEMPLATES.foo = compile('<div class="foo">{{outlet}}</div>');
+    Ember.TEMPLATES.index = compile('other');
+
+    App.IndexRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render({ into: 'foo' });
+      },
+      actions: {
+        disconnect: function() {
+          this.disconnectOutlet({
+            parentView: 'foo',
+            outlet: 'main'
+          });
+        }
+      }
+    });
+
+    bootApplication();
+    equal(Ember.$('#qunit-fixture .foo').text(), 'other');
+    Ember.run(router, 'send', 'disconnect');
+    equal(Ember.$('#qunit-fixture .foo').text(), '');
+  });
+
+
+  QUnit.test("Can render({into:...}) the render helper's children", function() {
+    Ember.TEMPLATES.application = compile('{{render "foo"}}');
+    Ember.TEMPLATES.foo = compile('<div class="foo">{{outlet}}</div>');
+    Ember.TEMPLATES.index = compile('<div class="index">{{outlet}}</div>');
+    Ember.TEMPLATES.other = compile('other');
+    Ember.TEMPLATES.bar = compile('bar');
+
+    App.IndexRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render({ into: 'foo' });
+        this.render('other', { into: 'index' });
+      },
+      actions: {
+        changeToBar: function() {
+          this.disconnectOutlet({
+            parentView: 'index',
+            outlet: 'main'
+          });
+          this.render('bar', { into: 'index' });
+        }
+      }
+    });
+
+    bootApplication();
+    equal(Ember.$('#qunit-fixture .foo .index').text(), 'other');
+    Ember.run(router, 'send', 'changeToBar');
+    equal(Ember.$('#qunit-fixture .foo .index').text(), 'bar');
+
+  });
+
+  QUnit.test("Can disconnect from the render helper's children", function() {
+    Ember.TEMPLATES.application = compile('{{render "foo"}}');
+    Ember.TEMPLATES.foo = compile('<div class="foo">{{outlet}}</div>');
+    Ember.TEMPLATES.index = compile('<div class="index">{{outlet}}</div>');
+    Ember.TEMPLATES.other = compile('other');
+
+    App.IndexRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render({ into: 'foo' });
+        this.render('other', { into: 'index' });
+      },
+      actions: {
+        disconnect: function() {
+          this.disconnectOutlet({
+            parentView: 'index',
+            outlet: 'main'
+          });
+        }
+      }
+    });
+
+    bootApplication();
+    equal(Ember.$('#qunit-fixture .foo .index').text(), 'other');
+    Ember.run(router, 'send', 'disconnect');
+    equal(Ember.$('#qunit-fixture .foo .index').text(), '');
+  });
+
 });
 enifed('ember/tests/routing/basic_test.jscs-test', function () {
 
@@ -71279,6 +72002,30 @@ enifed('ember/tests/routing/query_params_test', ['ember', 'ember-metal/computed'
     }
   });
 
+  QUnit.test("Single query params can be set on ObjectController [DEPRECATED]", function() {
+    expectDeprecation("Ember.ObjectController is deprecated, please use Ember.Controller and use `model.propertyName`.");
+
+    Router.map(function() {
+      this.route("home", { path: '/' });
+    });
+
+    App.HomeController = Ember.ObjectController.extend({
+      queryParams: ['foo'],
+      foo: "123"
+    });
+
+    bootApplication();
+
+    var controller = container.lookup('controller:home');
+
+    setAndFlush(controller, 'foo', '456');
+
+    equal(router.get('location.path'), "/?foo=456");
+
+    setAndFlush(controller, 'foo', '987');
+    equal(router.get('location.path'), "/?foo=987");
+  });
+
   QUnit.test("Single query params can be set", function() {
     Router.map(function() {
       this.route("home", { path: '/' });