ember-source 1.11.0.beta.1 → 1.11.0.beta.2

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.1
+ * @version   1.11.0-beta.2
  */
 
 (function() {
@@ -297,10 +297,7 @@ enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/error', 'embe
     Ember['default'].FEATURES['features-stripped-test'] = true;
     var featuresWereStripped = true;
 
-    if (Ember['default'].FEATURES.isEnabled('features-stripped-test')) {
-      featuresWereStripped = false;
-    }
-
+    
     delete Ember['default'].FEATURES['features-stripped-test'];
     _warnIfUsingStrippedFeatureFlags(Ember['default'].ENV.FEATURES, featuresWereStripped);
 
@@ -703,44 +700,7 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   */
   asyncHelper('click', click);
 
-  if (Ember['default'].FEATURES.isEnabled('ember-testing-checkbox-helpers')) {
-    /**
-    * Checks a checkbox. Ensures the presence of the `checked` attribute
-    *
-    * Example:
-    *
-    * ```javascript
-    * check('#remember-me').then(function() {
-    *   // assert something
-    * });
-    * ```
-    *
-    * @method check
-    * @param {String} selector jQuery selector finding an `input[type="checkbox"]`
-    * element on the DOM to check
-    * @return {RSVP.Promise}
-    */
-    asyncHelper('check', check);
-
     /**
-    * Unchecks a checkbox. Ensures the absence of the `checked` attribute
-    *
-    * Example:
-    *
-    * ```javascript
-    * uncheck('#remember-me').then(function() {
-    *   // assert something
-    * });
-    * ```
-    *
-    * @method check
-    * @param {String} selector jQuery selector finding an `input[type="checkbox"]`
-    * element on the DOM to uncheck
-    * @return {RSVP.Promise}
-    */
-    asyncHelper('uncheck', uncheck);
-  }
-  /**
   * Simulates a key event, e.g. `keypress`, `keydown`, `keyup` with the desired keyCode
   *
   * Example:

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.1
+ * @version   1.11.0-beta.2
  */
 
 (function() {
@@ -1904,12 +1904,6 @@ enifed('ember-application/tests/system/dependency_injection/default_resolver_tes
     helpers.registerHelper('fooresolvertest', fooresolvertestHelper);
     helpers.registerHelper('bar-baz-resolver-test', barBazResolverTestHelper);
 
-    var retrievedFooResolverTestHelper, retrievedBarBazResolverTestHelper;
-
-    
-      retrievedFooResolverTestHelper = locator.lookup('helper:fooresolvertest').helperFunction;
-      retrievedBarBazResolverTestHelper = locator.lookup('helper:bar-baz-resolver-test').helperFunction;
-    
     fooresolvertestHelper();
     barBazResolverTestHelper();
   });
@@ -2581,28 +2575,7 @@ enifed('ember-application/tests/system/initializers_test', ['ember-metal/run_loo
     });
   });
 
-  if (Ember.FEATURES.isEnabled("ember-application-initializer-context")) {
-    QUnit.test("initializers should be executed in their own context", function() {
-      expect(1);
-      var MyApplication = Application['default'].extend();
-
-      MyApplication.initializer({
-        name: 'coolBabeInitializer',
-        myProperty: 'coolBabe',
-        initialize: function(registry, application) {
-          equal(this.myProperty, 'coolBabe', 'should have access to its own context');
-        }
-      });
-
-      run['default'](function() {
-        app = MyApplication.create({
-          router: false,
-          rootElement: '#qunit-fixture'
-        });
-      });
-    });
-  }
-
+  
 });
 enifed('ember-application/tests/system/initializers_test.jscs-test', function () {
 
@@ -2628,349 +2601,10 @@ enifed('ember-application/tests/system/instance_initializers_test', ['ember-meta
 
   'use strict';
 
-  var app;
-
-  if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
-    QUnit.module("Ember.Application instance initializers", {
-      setup: function() {
-      },
-
-      teardown: function() {
-        if (app) {
-          run['default'](function() { app.destroy(); });
-        }
-      }
-    });
-
-    QUnit.test("initializers require proper 'name' and 'initialize' properties", function() {
-      var MyApplication = Application['default'].extend();
-
-      expectAssertion(function() {
-        run['default'](function() {
-          MyApplication.instanceInitializer({ name: 'initializer' });
-        });
-      });
-
-      expectAssertion(function() {
-        run['default'](function() {
-          MyApplication.instanceInitializer({ initialize: Ember.K });
-        });
-      });
-
-    });
-
-    QUnit.test("initializers are passed an app instance", function() {
-      var MyApplication = Application['default'].extend();
-
-      MyApplication.instanceInitializer({
-        name: 'initializer',
-        initialize: function(instance) {
-          ok(instance instanceof ApplicationInstance['default'], "initialize is passed an application instance");
-        }
-      });
-
-      run['default'](function() {
-        app = MyApplication.create({
-          router: false,
-          rootElement: '#qunit-fixture'
-        });
-      });
-    });
-
-    QUnit.test("initializers can be registered in a specified order", function() {
-      var order = [];
-      var MyApplication = Application['default'].extend();
-      MyApplication.instanceInitializer({
-        name: 'fourth',
-        after: 'third',
-        initialize: function(registry) {
-          order.push('fourth');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'second',
-        after: 'first',
-        before: 'third',
-        initialize: function(registry) {
-          order.push('second');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'fifth',
-        after: 'fourth',
-        before: 'sixth',
-        initialize: function(registry) {
-          order.push('fifth');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'first',
-        before: 'second',
-        initialize: function(registry) {
-          order.push('first');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'third',
-        initialize: function(registry) {
-          order.push('third');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'sixth',
-        initialize: function(registry) {
-          order.push('sixth');
-        }
-      });
-
-      run['default'](function() {
-        app = MyApplication.create({
-          router: false,
-          rootElement: '#qunit-fixture'
-        });
-      });
-
-      deepEqual(order, ['first', 'second', 'third', 'fourth', 'fifth', 'sixth']);
-    });
-
-    QUnit.test("initializers can be registered in a specified order as an array", function() {
-      var order = [];
-      var MyApplication = Application['default'].extend();
-
-
-      MyApplication.instanceInitializer({
-        name: 'third',
-        initialize: function(registry) {
-          order.push('third');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'second',
-        after: 'first',
-        before: ['third', 'fourth'],
-        initialize: function(registry) {
-          order.push('second');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'fourth',
-        after: ['second', 'third'],
-        initialize: function(registry) {
-          order.push('fourth');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'fifth',
-        after: 'fourth',
-        before: 'sixth',
-        initialize: function(registry) {
-          order.push('fifth');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'first',
-        before: ['second'],
-        initialize: function(registry) {
-          order.push('first');
-        }
-      });
-
-      MyApplication.instanceInitializer({
-        name: 'sixth',
-        initialize: function(registry) {
-          order.push('sixth');
-        }
-      });
-
-      run['default'](function() {
-        app = MyApplication.create({
-          router: false,
-          rootElement: '#qunit-fixture'
-        });
-      });
-
-      deepEqual(order, ['first', 'second', 'third', 'fourth', 'fifth', 'sixth']);
-    });
-
-    QUnit.test("initializers can have multiple dependencies", function () {
-      var order = [];
-      var a = {
-        name: "a",
-        before: "b",
-        initialize: function(registry) {
-          order.push('a');
-        }
-      };
-      var b = {
-        name: "b",
-        initialize: function(registry) {
-          order.push('b');
-        }
-      };
-      var c = {
-        name: "c",
-        after: "b",
-        initialize: function(registry) {
-          order.push('c');
-        }
-      };
-      var afterB = {
-        name: "after b",
-        after: "b",
-        initialize: function(registry) {
-          order.push("after b");
-        }
-      };
-      var afterC = {
-        name: "after c",
-        after: "c",
-        initialize: function(registry) {
-          order.push("after c");
-        }
-      };
-
-      Application['default'].instanceInitializer(b);
-      Application['default'].instanceInitializer(a);
-      Application['default'].instanceInitializer(afterC);
-      Application['default'].instanceInitializer(afterB);
-      Application['default'].instanceInitializer(c);
-
-      run['default'](function() {
-        app = Application['default'].create({
-          router: false,
-          rootElement: '#qunit-fixture'
-        });
-      });
-
-      ok(array.indexOf.call(order, a.name) < array.indexOf.call(order, b.name), 'a < b');
-      ok(array.indexOf.call(order, b.name) < array.indexOf.call(order, c.name), 'b < c');
-      ok(array.indexOf.call(order, b.name) < array.indexOf.call(order, afterB.name), 'b < afterB');
-      ok(array.indexOf.call(order, c.name) < array.indexOf.call(order, afterC.name), 'c < afterC');
-    });
-
-    QUnit.test("initializers set on Application subclasses should not be shared between apps", function() {
-      var firstInitializerRunCount = 0;
-      var secondInitializerRunCount = 0;
-      var FirstApp = Application['default'].extend();
-      FirstApp.instanceInitializer({
-        name: 'first',
-        initialize: function(registry) {
-          firstInitializerRunCount++;
-        }
-      });
-      var SecondApp = Application['default'].extend();
-      SecondApp.instanceInitializer({
-        name: 'second',
-        initialize: function(registry) {
-          secondInitializerRunCount++;
-        }
-      });
-      jQuery['default']('#qunit-fixture').html('<div id="first"></div><div id="second"></div>');
-      run['default'](function() {
-        FirstApp.create({
-          router: false,
-          rootElement: '#qunit-fixture #first'
-        });
-      });
-      equal(firstInitializerRunCount, 1, 'first initializer only was run');
-      equal(secondInitializerRunCount, 0, 'first initializer only was run');
-      run['default'](function() {
-        SecondApp.create({
-          router: false,
-          rootElement: '#qunit-fixture #second'
-        });
-      });
-      equal(firstInitializerRunCount, 1, 'second initializer only was run');
-      equal(secondInitializerRunCount, 1, 'second initializer only was run');
-    });
-
-    QUnit.test("initializers are concatenated", function() {
-      var firstInitializerRunCount = 0;
-      var secondInitializerRunCount = 0;
-      var FirstApp = Application['default'].extend();
-      FirstApp.instanceInitializer({
-        name: 'first',
-        initialize: function(registry) {
-          firstInitializerRunCount++;
-        }
-      });
-
-      var SecondApp = FirstApp.extend();
-      SecondApp.instanceInitializer({
-        name: 'second',
-        initialize: function(registry) {
-          secondInitializerRunCount++;
-        }
-      });
-
-      jQuery['default']('#qunit-fixture').html('<div id="first"></div><div id="second"></div>');
-      run['default'](function() {
-        FirstApp.create({
-          router: false,
-          rootElement: '#qunit-fixture #first'
-        });
-      });
-      equal(firstInitializerRunCount, 1, 'first initializer only was run when base class created');
-      equal(secondInitializerRunCount, 0, 'first initializer only was run when base class created');
-      firstInitializerRunCount = 0;
-      run['default'](function() {
-        SecondApp.create({
-          router: false,
-          rootElement: '#qunit-fixture #second'
-        });
-      });
-      equal(firstInitializerRunCount, 1, 'first initializer was run when subclass created');
-      equal(secondInitializerRunCount, 1, 'second initializers was run when subclass created');
-    });
-
-    QUnit.test("initializers are per-app", function() {
-      expect(0);
-      var FirstApp = Application['default'].extend();
-      FirstApp.instanceInitializer({
-        name: 'shouldNotCollide',
-        initialize: function(registry) {}
-      });
-
-      var SecondApp = Application['default'].extend();
-      SecondApp.instanceInitializer({
-        name: 'shouldNotCollide',
-        initialize: function(registry) {}
-      });
-    });
-
-    if (Ember.FEATURES.isEnabled("ember-application-initializer-context")) {
-      QUnit.test("initializers should be executed in their own context", function() {
-        expect(1);
-
-        var MyApplication = Application['default'].extend();
-
-        MyApplication.instanceInitializer({
-          name: 'coolBabeInitializer',
-          myProperty: 'coolBabe',
-          initialize: function(registry, application) {
-            equal(this.myProperty, 'coolBabe', 'should have access to its own context');
-          }
-        });
-
-        run['default'](function() {
-          app = MyApplication.create({
-            router: false,
-            rootElement: '#qunit-fixture'
-          });
-        });
-      });
-    }
-  }
+  var app, initializeContextFeatureEnabled;
 
+  
+  
 });
 enifed('ember-application/tests/system/instance_initializers_test.jscs-test', function () {
 
@@ -2992,7 +2626,7 @@ enifed('ember-application/tests/system/instance_initializers_test.jshint', funct
   });
 
 });
-enifed('ember-application/tests/system/logging_test', ['ember-metal/run_loop', 'ember-application/system/application', 'ember-views/views/view', 'ember-runtime/controllers/controller', 'ember-routing/system/route', 'ember-runtime/ext/rsvp', 'ember-metal/keys', 'ember-routing'], function (run, Application, View, Controller, Route, RSVP, keys) {
+enifed('ember-application/tests/system/logging_test', ['ember-metal/run_loop', 'ember-application/system/application', 'ember-views/views/view', 'ember-runtime/controllers/controller', 'ember-routing/system/route', 'ember-runtime/ext/rsvp', 'ember-metal/keys', 'ember-template-compiler/system/compile', 'ember-routing'], function (run, Application, View, Controller, Route, RSVP, keys, compile) {
 
   'use strict';
 
@@ -3170,7 +2804,7 @@ enifed('ember-application/tests/system/logging_test', ['ember-metal/run_loop', '
       return;
     }
 
-    App.register('template:application', function() { return ''; });
+    App.register('template:application', compile['default']("{{outlet}}"));
     run['default'](App, 'advanceReadiness');
 
     visit('/posts').then(function() {
@@ -3198,7 +2832,7 @@ enifed('ember-application/tests/system/logging_test', ['ember-metal/run_loop', '
       return;
     }
 
-    App.register('template:application', function() { return 'Template with default view'; });
+    App.register('template:application', compile['default']('{{outlet}}'));
     App.register('template:foo', function() { return 'Template with custom view'; });
     App.register('view:posts', View['default'].extend({ templateName: 'foo' }));
     run['default'](App, 'advanceReadiness');
@@ -3712,73 +3346,7 @@ enifed('ember-application/tests/system/visit_test', ['ember-metal/run_loop', 'em
     return App;
   }
 
-  if (Ember.FEATURES.isEnabled('ember-application-visit')) {
-    QUnit.module("Ember.Application - visit()");
-
-    // This tests whether the application is "autobooted" by registering an
-    // instance initializer and asserting it never gets run. Since this is
-    // inherently testing that async behavior *doesn't* happen, we set a
-    // 500ms timeout to verify that when autoboot is set to false, the
-    // instance initializer that would normally get called on DOM ready
-    // does not fire.
-    QUnit.test("Applications with autoboot set to false do not autoboot", function(assert) {
-      QUnit.expect(1);
-      QUnit.stop();
-
-      run['default'](function() {
-        var app = createApplication();
-
-        // Start the timeout
-        var timeout = setTimeout(function() {
-          ok(true, "500ms elapsed without initializers being called");
-          QUnit.start();
-        }, 500);
-
-        // Create an instance initializer that should *not* get run.
-        app.instanceInitializer({
-          name: "assert-no-autoboot",
-          initialize: function() {
-            clearTimeout(timeout);
-            QUnit.start();
-            assert.ok(false, "instance should not have been created");
-          }
-        });
-      });
-    });
-
-    QUnit.test("visit() returns a promise that resolves when the view has rendered", function(assert) {
-      QUnit.expect(3);
-      QUnit.stop();
-
-      var app;
-
-      run['default'](function() {
-        app = createApplication();
-        app.instanceInitializer({
-          name: 'register-application-template',
-          initialize: function(app) {
-            app.registry.register('template:application', compile['default']('<h1>Hello world</h1>'));
-          }
-        });
-      });
-
-      assert.equal(Ember.$('#qunit-fixture').children().length, 0, "there are no elements in the fixture element");
-
-      app.visit('/').then(function(instance) {
-        QUnit.start();
-        assert.ok(instance instanceof ApplicationInstance['default'], "promise is resolved with an ApplicationInstance");
-
-        run['default'](instance.view, 'appendTo', '#qunit-fixture');
-        assert.equal(Ember.$("#qunit-fixture > .ember-view h1").text(), "Hello world", "the application was rendered once the promise resolves");
-
-        instance.destroy();
-      }, function(error) {
-        QUnit.start();
-        assert.ok(false, "The visit() promise was rejected: " + error);
-      });
-    });
-  }
-
+  
 });
 enifed('ember-application/tests/system/visit_test.jscs-test', function () {
 
@@ -6972,9 +6540,6 @@ enifed('ember-htmlbars/tests/compat/helper_test', ['ember-htmlbars/compat/helper
 
   var view;
 
-  
-  // jscs:disable validateIndentation
-
   QUnit.module('ember-htmlbars: Handlebars compatible helpers', {
     teardown: function() {
       utils.runDestroy(view);
@@ -7231,9 +6796,6 @@ enifed('ember-htmlbars/tests/compat/helper_test', ['ember-htmlbars/compat/helper
     utils.runAppend(view);
   });
 
-  // jscs:enable validateIndentation
-  
-
 });
 enifed('ember-htmlbars/tests/compat/helper_test.jscs-test', function () {
 
@@ -7913,7 +7475,6 @@ enifed('ember-htmlbars/tests/compat/precompile_test', ['ember-htmlbars/compat'],
   'use strict';
 
   var precompile = EmberHandlebars['default'].precompile;
-  var parse = EmberHandlebars['default'].parse;
   var template = 'Hello World';
   var result;
 
@@ -7934,18 +7495,6 @@ enifed('ember-htmlbars/tests/compat/precompile_test', ['ember-htmlbars/compat'],
     equal(typeof(result), "string");
   });
 
-  if (!Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  // jscs:disable validateIndentation
-
-  QUnit.test("precompile creates an object when passed an AST", function() {
-    var ast = parse(template);
-    result = precompile(ast);
-    equal(typeof(result), "object");
-  });
-
-  // jscs:enable validateIndentation
-  }
-
 });
 enifed('ember-htmlbars/tests/compat/precompile_test.jscs-test', function () {
 
@@ -8162,22 +7711,20 @@ enifed('ember-htmlbars/tests/helpers/bind_attr_test', ['ember-metal/core', 'embe
     var originalBindAttr = helpers['default']['bind-attr'];
 
     try {
-      
-        helpers['default']['bind-attr'] = {
-          helperFunction: function() {
-            equal(arguments[0], 'foo', 'First arg match');
-            equal(arguments[1], 'bar', 'Second arg match');
+      helpers['default']['bind-attr'] = {
+        helperFunction: function() {
+          equal(arguments[0], 'foo', 'First arg match');
+          equal(arguments[1], 'bar', 'Second arg match');
+
+          return 'result';
+        }
+      };
 
-            return 'result';
-          }
-        };
-      
       expectDeprecation(function() {
         var result;
 
-        
-          result = helpers['default'].bindAttr.helperFunction('foo', 'bar');
-                equal(result, 'result', 'Result match');
+        result = helpers['default'].bindAttr.helperFunction('foo', 'bar');
+        equal(result, 'result', 'Result match');
       }, "The 'bindAttr' view helper is deprecated in favor of 'bind-attr'");
     } finally {
       helpers['default']['bind-attr'] = originalBindAttr;
@@ -8534,6 +8081,32 @@ 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() {
+    var template = compile['default']("<img {{bind-attr src=view.undefinedValue}}>");
+
+    view = EmberView['default'].create({
+      template: template,
+      undefinedValue: undefined
+    });
+
+    utils.runAppend(view);
+
+    ok(!view.element.hasAttribute('src'), "src attribute not present");
+  });
+
+  QUnit.test("src attribute bound to null is not present", function() {
+    var template = compile['default']("<img {{bind-attr src=view.nullValue}}>");
+
+    view = EmberView['default'].create({
+      template: template,
+      nullValue: null
+    });
+
+    utils.runAppend(view);
+
+    ok(!view.element.hasAttribute('src'), "src attribute not present");
+  });
+
 });
 enifed('ember-htmlbars/tests/helpers/bind_attr_test.jscs-test', function () {
 
@@ -8632,10 +8205,7 @@ enifed('ember-htmlbars/tests/helpers/collection_test', ['ember-views/views/colle
       template: compile['default']('{{#collection content=view.exampleController itemViewClass=TemplateTests.ExampleItemView}}beta{{/collection}}')
     });
 
-    var deprecation = /Resolved the view "TemplateTests.ExampleItemView" on the global context/;
-    
-      deprecation = /Global lookup of TemplateTests.ExampleItemView from a Handlebars template is deprecated/;
-    
+    var deprecation = /Global lookup of TemplateTests.ExampleItemView from a Handlebars template is deprecated/;
     expectDeprecation(function() {
       utils.runAppend(view);
     }, deprecation);
@@ -10056,10 +9626,7 @@ enifed('ember-htmlbars/tests/helpers/each_test', ['ember-metal/core', 'ember-run
       people: people
     });
 
-    var deprecation = /Resolved the view "MyView" on the global context/;
-    
-      deprecation = /Global lookup of MyView from a Handlebars template is deprecated/;
-    
+    var deprecation = /Global lookup of MyView from a Handlebars template is deprecated/;
 
     expectDeprecation(function() {
       utils.runAppend(view);
@@ -10175,11 +9742,7 @@ enifed('ember-htmlbars/tests/helpers/each_test', ['ember-metal/core', 'ember-run
       people: native_array.A()
     });
 
-    var deprecation = /Resolved the view "MyEmptyView" on the global context/;
-
-    
-      deprecation = /Global lookup of MyEmptyView from a Handlebars template is deprecated/;
-    
+    var deprecation = /Global lookup of MyEmptyView from a Handlebars template is deprecated/;
 
     expectDeprecation(function() {
       utils.runAppend(view);
@@ -10584,10 +10147,7 @@ enifed('ember-htmlbars/tests/helpers/each_test', ['ember-metal/core', 'ember-run
   }
 
   testEachWithItem("{{#each foo in bar}}", false);
-
-  
-    testEachWithItem("{{#each bar as |foo|}}", true);
-  
+  testEachWithItem("{{#each bar as |foo|}}", true);
 
 });
 enifed('ember-htmlbars/tests/helpers/each_test.jscs-test', function () {
@@ -11889,8 +11449,6 @@ enifed('ember-htmlbars/tests/helpers/loc_test', ['ember-views/views/view', 'embe
     utils.runDestroy(view);
   });
 
-  
-  // jscs:disable validateIndentation
   QUnit.test('localize throws an assertion if the second parameter is a binding', function() {
     var view = buildView('{{loc "Hello %@" name}}', {
       name: 'Bob Foster'
@@ -11914,8 +11472,6 @@ enifed('ember-htmlbars/tests/helpers/loc_test', ['ember-views/views/view', 'embe
 
     utils.runDestroy(view);
   });
-  // jscs:enable validateIndentation
-  
 
 });
 enifed('ember-htmlbars/tests/helpers/loc_test.jscs-test', function () {
@@ -14580,61 +14136,57 @@ enifed('ember-htmlbars/tests/helpers/with_test', ['ember-views/views/view', 'emb
     equal(view.$().text(), "We have: this is from the view and this is from the context", "should render");
   });
 
-  
-    testWithAs("ember-htmlbars: {{#with x as |y|}}", "{{#with person as |tom|}}{{title}}: {{tom.name}}{{/with}}");
-  
+  testWithAs("ember-htmlbars: {{#with x as |y|}}", "{{#with person as |tom|}}{{title}}: {{tom.name}}{{/with}}");
 
-  
-    QUnit.module("Multiple Handlebars {{with foo as |bar|}} helpers", {
-      setup: function() {
-        Ember.lookup = lookup = { Ember: Ember };
+  QUnit.module("Multiple Handlebars {{with foo as |bar|}} helpers", {
+    setup: function() {
+      Ember.lookup = lookup = { Ember: Ember };
 
-        view = EmberView['default'].create({
-          template: compile['default']("Admin: {{#with admin as |person|}}{{person.name}}{{/with}} User: {{#with user as |person|}}{{person.name}}{{/with}}"),
-          context: {
-            admin: { name: "Tom Dale" },
-            user: { name: "Yehuda Katz" }
-          }
-        });
+      view = EmberView['default'].create({
+        template: compile['default']("Admin: {{#with admin as |person|}}{{person.name}}{{/with}} User: {{#with user as |person|}}{{person.name}}{{/with}}"),
+        context: {
+          admin: { name: "Tom Dale" },
+          user: { name: "Yehuda Katz" }
+        }
+      });
 
-        utils.runAppend(view);
-      },
+      utils.runAppend(view);
+    },
 
-      teardown: function() {
-        utils.runDestroy(view);
-        Ember.lookup = originalLookup;
-      }
-    });
+    teardown: function() {
+      utils.runDestroy(view);
+      Ember.lookup = originalLookup;
+    }
+  });
 
-    QUnit.test("re-using the same variable with different #with blocks does not override each other", function() {
-      equal(view.$().text(), "Admin: Tom Dale User: Yehuda Katz", "should be properly scoped");
-    });
+  QUnit.test("re-using the same variable with different #with blocks does not override each other", function() {
+    equal(view.$().text(), "Admin: Tom Dale User: Yehuda Katz", "should be properly scoped");
+  });
 
-    QUnit.test("the scoped variable is not available outside the {{with}} block.", function() {
-      run['default'](function() {
-        view.set('template', compile['default']("{{name}}-{{#with other as |name|}}{{name}}{{/with}}-{{name}}"));
-        view.set('context', {
-          name: 'Stef',
-          other: 'Yehuda'
-        });
+  QUnit.test("the scoped variable is not available outside the {{with}} block.", function() {
+    run['default'](function() {
+      view.set('template', compile['default']("{{name}}-{{#with other as |name|}}{{name}}{{/with}}-{{name}}"));
+      view.set('context', {
+        name: 'Stef',
+        other: 'Yehuda'
       });
-
-      equal(view.$().text(), "Stef-Yehuda-Stef", "should be properly scoped after updating");
     });
 
-    QUnit.test("nested {{with}} blocks shadow the outer scoped variable properly.", function() {
-      run['default'](function() {
-        view.set('template', compile['default']("{{#with first as |ring|}}{{ring}}-{{#with fifth as |ring|}}{{ring}}-{{#with ninth as |ring|}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}{{/with}}"));
-        view.set('context', {
-          first: 'Limbo',
-          fifth: 'Wrath',
-          ninth: 'Treachery'
-        });
-      });
+    equal(view.$().text(), "Stef-Yehuda-Stef", "should be properly scoped after updating");
+  });
 
-      equal(view.$().text(), "Limbo-Wrath-Treachery-Wrath-Limbo", "should be properly scoped after updating");
+  QUnit.test("nested {{with}} blocks shadow the outer scoped variable properly.", function() {
+    run['default'](function() {
+      view.set('template', compile['default']("{{#with first as |ring|}}{{ring}}-{{#with fifth as |ring|}}{{ring}}-{{#with ninth as |ring|}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}{{/with}}"));
+      view.set('context', {
+        first: 'Limbo',
+        fifth: 'Wrath',
+        ninth: 'Treachery'
+      });
     });
-  
+
+    equal(view.$().text(), "Limbo-Wrath-Treachery-Wrath-Limbo", "should be properly scoped after updating");
+  });
 
 });
 enifed('ember-htmlbars/tests/helpers/with_test.jscs-test', function () {
@@ -14860,31 +14412,6 @@ enifed('ember-htmlbars/tests/helpers/yield_test', ['ember-metal/run_loop', 'embe
     equal(view.$('div p:contains(update) + p:contains(update)').length, 1, "keyword has correctly propagated update");
   });
 
-  if (!Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  // jscs:disable validateIndentation
-
-  QUnit.test("yield uses the layout context for non component [DEPRECATED]", function() {
-    view = EmberView['default'].create({
-      controller: {
-        boundText: "outer",
-        inner: {
-          boundText: "inner"
-        }
-      },
-      layout: compile['default']("<p>{{boundText}}</p>{{#with inner}}<p>{{yield}}</p>{{/with}}"),
-      template: compile['default']('{{boundText}}')
-    });
-
-    expectDeprecation(function() {
-      utils.runAppend(view);
-    }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
-
-    equal('outerinner', view.$('p').text(), "Yield points at the right context");
-  });
-
-  // jscs:enable validateIndentation
-  }
-
   QUnit.test("yield view should be a virtual view", function() {
     var component = Component['default'].extend({
       isParentComponent: true,
@@ -15055,57 +14582,7 @@ enifed('ember-htmlbars/tests/hooks/component_test', ['ember-views/component_look
 
   var view, registry, container;
 
-  // this is working around a bug in defeatureify that prevents nested flags
-  // from being stripped
-  var componentGenerationEnabled = false;
-  if (Ember.FEATURES.isEnabled('ember-htmlbars-component-generation')) {
-    componentGenerationEnabled = true;
-  }
-
   
-    if (componentGenerationEnabled) {
-      QUnit.module("ember-htmlbars: component hook", {
-        setup: function() {
-          registry = new Registry['default']();
-          container = registry.container();
-
-          registry.optionsForType('template', { instantiate: false });
-          registry.register('component-lookup:main', ComponentLookup['default']);
-        },
-
-        teardown: function() {
-          utils.runDestroy(view);
-          utils.runDestroy(container);
-          registry = container = view = null;
-        }
-      });
-
-      QUnit.test("component is looked up from the container", function() {
-        registry.register('template:components/foo-bar', compile['default']('yippie!'));
-
-        view = EmberView['default'].create({
-          container: container,
-          template: compile['default']("<foo-bar />")
-        });
-
-        utils.runAppend(view);
-
-        equal(view.$().text(), 'yippie!', 'component was looked up and rendered');
-      });
-
-      QUnit.test("asserts if component is not found", function() {
-        view = EmberView['default'].create({
-          container: container,
-          template: compile['default']("<foo-bar />")
-        });
-
-        expectAssertion(function() {
-          utils.runAppend(view);
-        }, 'You specified `foo-bar` in your template, but a component for `foo-bar` could not be found.');
-      });
-    }
-  
-
 });
 enifed('ember-htmlbars/tests/hooks/component_test.jscs-test', function () {
 
@@ -15227,48 +14704,46 @@ enifed('ember-htmlbars/tests/hooks/text_node_test', ['ember-views/views/view', '
 
   var view;
 
-  
-    QUnit.module("ember-htmlbars: hooks/text_node_test", {
-      teardown: function() {
-        utils.runDestroy(view);
-      }
+  QUnit.module("ember-htmlbars: hooks/text_node_test", {
+    teardown: function() {
+      utils.runDestroy(view);
+    }
+  });
+
+  QUnit.test("property is output", function() {
+    view = EmberView['default'].create({
+      context: { name: 'erik' },
+      template: compile['default']("ohai {{name}}")
     });
+    utils.runAppend(view);
 
-    QUnit.test("property is output", function() {
-      view = EmberView['default'].create({
-        context: { name: 'erik' },
-        template: compile['default']("ohai {{name}}")
-      });
-      utils.runAppend(view);
+    htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai erik', "property is output");
+  });
 
-      htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai erik', "property is output");
+  QUnit.test("path is output", function() {
+    view = EmberView['default'].create({
+      context: { name: { firstName: 'erik' } },
+      template: compile['default']("ohai {{name.firstName}}")
     });
+    utils.runAppend(view);
 
-    QUnit.test("path is output", function() {
-      view = EmberView['default'].create({
-        context: { name: { firstName: 'erik' } },
-        template: compile['default']("ohai {{name.firstName}}")
-      });
-      utils.runAppend(view);
+    htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai erik', "path is output");
+  });
 
-      htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai erik', "path is output");
+  QUnit.test("changed property updates", function() {
+    var context = EmberObject['default'].create({ name: 'erik' });
+    view = EmberView['default'].create({
+      context: context,
+      template: compile['default']("ohai {{name}}")
     });
+    utils.runAppend(view);
 
-    QUnit.test("changed property updates", function() {
-      var context = EmberObject['default'].create({ name: 'erik' });
-      view = EmberView['default'].create({
-        context: context,
-        template: compile['default']("ohai {{name}}")
-      });
-      utils.runAppend(view);
-
-      htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai erik', "precond - original property is output");
+    htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai erik', "precond - original property is output");
 
-      run['default'](context, context.set, 'name', 'mmun');
+    run['default'](context, context.set, 'name', 'mmun');
 
-      htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai mmun', "new property is output");
-    });
-  
+    htmlbars_test_helpers.equalInnerHTML(view.element, 'ohai mmun', "new property is output");
+  });
 
 });
 enifed('ember-htmlbars/tests/hooks/text_node_test.jscs-test', function () {
@@ -15295,19 +14770,16 @@ enifed('ember-htmlbars/tests/htmlbars_test', ['ember-template-compiler/system/co
 
   'use strict';
 
-  
-
-    QUnit.module("ember-htmlbars: main");
+  QUnit.module("ember-htmlbars: main");
 
-    QUnit.test("HTMLBars is present and can be executed", function() {
-      var template = compile['default']("ohai");
+  QUnit.test("HTMLBars is present and can be executed", function() {
+    var template = compile['default']("ohai");
 
-      var env = merge['default']({ dom: defaultEnv.domHelper }, defaultEnv['default']);
+    var env = merge['default']({ dom: defaultEnv.domHelper }, defaultEnv['default']);
 
-      var output = template.render({}, env, document.body);
-      htmlbars_test_helpers.equalHTML(output, "ohai");
-    });
-  
+    var output = template.render({}, env, document.body);
+    htmlbars_test_helpers.equalHTML(output, "ohai");
+  });
 
 });
 enifed('ember-htmlbars/tests/htmlbars_test.jscs-test', function () {
@@ -15537,9 +15009,6 @@ enifed('ember-htmlbars/tests/integration/block_params_test', ['container/registr
     });
   }
 
-  
-  // jscs:disable validateIndentation
-
   QUnit.module("ember-htmlbars: block params", {
     setup: function() {
       helpers.registerHelper('alias', aliasHelper);
@@ -15656,9 +15125,6 @@ enifed('ember-htmlbars/tests/integration/block_params_test', ['container/registr
     equal(view.$().text(), "ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn");
   });
 
-  // jscs:enable validateIndentation
-  
-
 });
 enifed('ember-htmlbars/tests/integration/block_params_test.jscs-test', function () {
 
@@ -16941,9 +16407,6 @@ enifed('ember-htmlbars/tests/system/make_bound_helper_test', ['ember-views/views
     }));
   }
 
-  
-  // jscs:disable validateIndentation
-
   QUnit.module("ember-htmlbars: makeBoundHelper", {
     setup: function() {
       registry = new Registry['default']();
@@ -17199,9 +16662,6 @@ enifed('ember-htmlbars/tests/system/make_bound_helper_test', ['ember-views/views
     equal(view.$().text(), 'aaa');
   });
 
-  // jscs:enable validateIndentation
-  
-
 });
 enifed('ember-htmlbars/tests/system/make_bound_helper_test.jscs-test', function () {
 
@@ -17278,6 +16738,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.2',
         render: function(view, env, contextualElement, blockArguments) {
           for (var i = 0, l = keyNames.length; i < l; i++) {
             var keyName = keyNames[i];
@@ -17291,6 +16752,21 @@ enifed('ember-htmlbars/tests/system/render_view_test', ['ember-runtime/tests/uti
     utils.runAppend(view);
   });
 
+  QUnit.test('Provides a helpful assertion if revisions do not match.', function() {
+    view = EmberView['default'].create({
+      template: {
+        isHTMLBars: true,
+        revision: 'Foo-Bar-Baz',
+        render: function() { }
+      }
+    });
+
+    expectAssertion(function() {
+      utils.runAppend(view);
+    },
+    /was compiled with `Foo-Bar-Baz`/);
+  });
+
 });
 enifed('ember-htmlbars/tests/system/render_view_test.jscs-test', function () {
 
@@ -17731,15 +17207,13 @@ enifed('ember-metal-views/tests/test_helpers', ['exports', 'ember-metal/platform
       }
     }
     if (view.childViews) {
-      view._childViewsMorph = this._dom.createMorph(el, null, null);
+      view._childViewsMorph = this._dom.appendMorph(el);
     } else if (view.textContent) {
       setElementText(el, view.textContent);
     } else if (view.innerHTML) {
       this._dom.detectNamespace(el);
-      var nodes = this._dom.parseHTML(view.innerHTML, el);
-      while (nodes[0]) {
-        el.appendChild(nodes[0]);
-      }
+      var frag = this._dom.parseHTML(view.innerHTML, el);
+      el.appendChild(frag);
     }
     return el;
   };
@@ -20851,71 +20325,7 @@ enifed('ember-metal/tests/computed_test', ['ember-metal/core', 'ember-metal/test
   // improved-cp-syntax
   //
 
-  if (Ember['default'].FEATURES.isEnabled("new-computed-syntax")) {
-    QUnit.module('computed - improved cp syntax');
-
-    QUnit.test('setter and getters are passed using an object', function() {
-      var testObj = Ember['default'].Object.extend({
-        a: '1',
-        b: '2',
-        aInt: computed.computed('a', {
-          get: function(keyName) {
-            equal(keyName, 'aInt', 'getter receives the keyName');
-            return parseInt(this.get('a'));
-          },
-          set: function(keyName, value, oldValue) {
-            equal(keyName, 'aInt', 'setter receives the keyName');
-            equal(value, 123, 'setter receives the new value');
-            equal(oldValue, 1, 'setter receives the old value');
-            this.set('a', ""+value); // side effect
-            return parseInt(this.get('a'));
-          }
-        })
-      }).create();
-
-      ok(testObj.get('aInt') === 1, 'getter works');
-      testObj.set('aInt', 123);
-      ok(testObj.get('a') === '123', 'setter works');
-      ok(testObj.get('aInt') === 123, 'cp has been updated too');
-    });
-
-    QUnit.test('setter can be omited', function() {
-      var testObj = Ember['default'].Object.extend({
-        a: '1',
-        b: '2',
-        aInt: computed.computed('a', {
-          get: function(keyName) {
-            equal(keyName, 'aInt', 'getter receives the keyName');
-            return parseInt(this.get('a'));
-          }
-        })
-      }).create();
-
-      ok(testObj.get('aInt') === 1, 'getter works');
-      ok(testObj.get('a') === '1');
-      testObj.set('aInt', '123');
-      ok(testObj.get('aInt') === '123', 'cp has been updated too');
-    });
-
-    QUnit.test('the return value of the setter gets cached', function() {
-      var testObj = Ember['default'].Object.extend({
-        a: '1',
-        sampleCP: computed.computed('a', {
-          get: function(keyName) {
-            ok(false, "The getter should not be invoked");
-            return 'get-value';
-          },
-          set: function(keyName, value, oldValue) {
-            return 'set-value';
-          }
-        })
-      }).create();
-
-      testObj.set('sampleCP', 'abcd');
-      ok(testObj.get('sampleCP') === 'set-value', 'The return value of the CP was cached');
-    });
-  }
-
+  
   // ..........................................................
   // BUGS
   //
@@ -29411,8 +28821,6 @@ enifed('ember-routing-htmlbars/tests/helpers/action_test', ['ember-metal/core',
     equal(watted, true, "The action was called on the right context");
   });
 
-  if (!Ember['default'].FEATURES.isEnabled('ember-htmlbars')) {
-  // jscs:disable validateIndentation
   QUnit.test("should target the current controller inside an {{each}} loop [DEPRECATED]", function() {
     var registeredTarget;
 
@@ -29435,7 +28843,7 @@ enifed('ember-routing-htmlbars/tests/helpers/action_test', ['ember-metal/core',
 
     view = EmberView['default'].create({
       controller: controller,
-      template: compile['default']('{{#each controller}}{{action "editTodo"}}{{/each}}')
+      template: compile['default']('{{#each controller}}<button {{action "editTodo"}}>Edit</button>{{/each}}')
     });
 
     expectDeprecation(function() {
@@ -29444,8 +28852,6 @@ enifed('ember-routing-htmlbars/tests/helpers/action_test', ['ember-metal/core',
 
     equal(registeredTarget, itemController, "the item controller is the target of action");
   });
-  // jscs:enable validateIndentation
-  }
 
   QUnit.test("should target the with-controller inside an {{#with controller='person'}} [DEPRECATED]", function() {
     var registeredTarget;
@@ -30486,13 +29892,13 @@ enifed('ember-routing-htmlbars/tests/helpers/link-to_test.jshint', function () {
   });
 
 });
-enifed('ember-routing-htmlbars/tests/helpers/outlet_test', ['ember-metal/core', 'ember-metal/run_loop', 'ember-runtime/system/namespace', 'ember-views/views/metamorph_view', 'ember-routing/ext/view', 'ember-views/views/container_view', 'ember-views/system/jquery', 'ember-routing-htmlbars/helpers/outlet', 'ember-template-compiler/system/compile', 'ember-htmlbars/helpers', 'ember-runtime/tests/utils', 'ember-routing-htmlbars/tests/utils'], function (Ember, run, Namespace, _MetamorphView, EmberView, EmberContainerView, jQuery, outlet, compile, helpers, utils, tests__utils) {
+enifed('ember-routing-htmlbars/tests/helpers/outlet_test', ['ember-metal/run_loop', 'ember-runtime/system/namespace', 'ember-views/views/view', 'ember-views/system/jquery', 'ember-routing-htmlbars/helpers/outlet', 'ember-template-compiler/system/compile', 'ember-htmlbars/helpers', 'ember-runtime/tests/utils', 'ember-routing-htmlbars/tests/utils'], function (run, Namespace, EmberView, jQuery, outlet, compile, helpers, utils, tests__utils) {
 
   'use strict';
 
   var trim = jQuery['default'].trim;
 
-  var view, registry, container, originalOutletHelper;
+  var registry, container, originalOutletHelper, top;
 
   QUnit.module("ember-routing-htmlbars: {{outlet}} helper", {
     setup: function() {
@@ -30502,6 +29908,9 @@ enifed('ember-routing-htmlbars/tests/helpers/outlet_test', ['ember-metal/core',
       var namespace = Namespace['default'].create();
       registry = tests__utils.buildRegistry(namespace);
       container = registry.container();
+
+      var CoreOutlet = container.lookupFactory('view:core-outlet');
+      top = CoreOutlet.create();
     },
 
     teardown: function() {
@@ -30509,301 +29918,231 @@ enifed('ember-routing-htmlbars/tests/helpers/outlet_test', ['ember-metal/core',
       helpers['default']['outlet'] = originalOutletHelper;
 
       utils.runDestroy(container);
-      utils.runDestroy(view);
-      registry = container = view = null;
+      utils.runDestroy(top);
+      registry = container = top = null;
     }
   });
 
-  QUnit.test("view should support connectOutlet for the main outlet", function() {
-    var template = "<h1>HI</h1>{{outlet}}";
-    view = EmberView['default'].create({
-      template: compile['default'](template)
-    });
+  QUnit.test("view should render the outlet when set after dom insertion", function() {
+    var routerState = withTemplate("<h1>HI</h1>{{outlet}}");
+    top.setOutletState(routerState);
+    utils.runAppend(top);
 
-    utils.runAppend(view);
+    equal(top.$().text(), 'HI');
 
-    equal(view.$().text(), 'HI');
+    routerState.outlets.main = withTemplate("<p>BYE</p>");
 
     run['default'](function() {
-      view.connectOutlet('main', EmberView['default'].create({
-        template: compile['default']("<p>BYE</p>")
-      }));
+      top.setOutletState(routerState);
     });
 
     // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HIBYE');
+    equal(trim(top.$().text()), 'HIBYE');
   });
 
-  QUnit.test("outlet should support connectOutlet in slots in prerender state", function() {
-    var template = "<h1>HI</h1>{{outlet}}";
-    view = EmberView['default'].create({
-      template: compile['default'](template)
-    });
+  QUnit.test("view should render the outlet when set before dom insertion", function() {
+    var routerState = withTemplate("<h1>HI</h1>{{outlet}}");
+    routerState.outlets.main = withTemplate("<p>BYE</p>");
+    top.setOutletState(routerState);
+    utils.runAppend(top);
 
-    view.connectOutlet('main', EmberView['default'].create({
-      template: compile['default']("<p>BYE</p>")
-    }));
-
-    utils.runAppend(view);
-
-    equal(view.$().text(), 'HIBYE');
+    // Replace whitespace for older IE
+    equal(trim(top.$().text()), 'HIBYE');
   });
 
+
   QUnit.test("outlet should support an optional name", function() {
-    var template = "<h1>HI</h1>{{outlet 'mainView'}}";
-    view = EmberView['default'].create({
-      template: compile['default'](template)
-    });
+    var routerState = withTemplate("<h1>HI</h1>{{outlet 'mainView'}}");
+    top.setOutletState(routerState);
+    utils.runAppend(top);
 
-    utils.runAppend(view);
+    equal(top.$().text(), 'HI');
 
-    equal(view.$().text(), 'HI');
+    routerState.outlets.mainView = withTemplate("<p>BYE</p>");
 
     run['default'](function() {
-      view.connectOutlet('mainView', EmberView['default'].create({
-        template: compile['default']("<p>BYE</p>")
-      }));
+      top.setOutletState(routerState);
     });
 
     // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HIBYE');
+    equal(trim(top.$().text()), 'HIBYE');
   });
 
 
   QUnit.test("outlet should correctly lookup a view", function() {
-
-    var template,
-        ContainerView,
-        childView;
-
-    ContainerView = EmberContainerView['default'].extend();
-
-    registry.register("view:containerView", ContainerView);
-
-    template = "<h1>HI</h1>{{outlet view='containerView'}}";
-
-    view = EmberView['default'].create({
-      template: compile['default'](template),
-      container : container
+    var CoreOutlet = container.lookupFactory('view:core-outlet');
+    var SpecialOutlet = CoreOutlet.extend({
+      classNames: ['special']
     });
 
-    childView = EmberView['default'].create({
-      template: compile['default']("<p>BYE</p>")
-    });
+    registry.register("view:special-outlet", SpecialOutlet);
 
-    utils.runAppend(view);
+    var routerState = withTemplate("<h1>HI</h1>{{outlet view='special-outlet'}}");
+    top.setOutletState(routerState);
+    utils.runAppend(top);
 
-    equal(view.$().text(), 'HI');
+    equal(top.$().text(), 'HI');
 
+    routerState.outlets.main = withTemplate("<p>BYE</p>");
     run['default'](function() {
-      view.connectOutlet('main', childView);
+      top.setOutletState(routerState);
     });
 
-    ok(ContainerView.detectInstance(childView._parentView), "The custom view class should be used for the outlet");
-
     // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HIBYE');
-
+    equal(trim(top.$().text()), 'HIBYE');
+    equal(top.$().find('.special').length, 1, "expected to find .special element");
   });
 
   QUnit.test("outlet should assert view is specified as a string", function() {
-
-    var template = "<h1>HI</h1>{{outlet view=containerView}}";
+    top.setOutletState(withTemplate("<h1>HI</h1>{{outlet view=containerView}}"));
 
     expectAssertion(function () {
-
-      view = EmberView['default'].create({
-        template: compile['default'](template),
-        container : container
-      });
-
-      utils.runAppend(view);
-
-    });
+      utils.runAppend(top);
+    }, /Using a quoteless view parameter with {{outlet}} is not supported/);
 
   });
 
   QUnit.test("outlet should assert view path is successfully resolved", function() {
-
-    var template = "<h1>HI</h1>{{outlet view='someViewNameHere'}}";
+    top.setOutletState(withTemplate("<h1>HI</h1>{{outlet view='someViewNameHere'}}"));
 
     expectAssertion(function () {
-
-      view = EmberView['default'].create({
-        template: compile['default'](template),
-        container : container
-      });
-
-      utils.runAppend(view);
-
-    });
+      utils.runAppend(top);
+    }, "The view name you supplied 'someViewNameHere' did not resolve to a view.");
 
   });
 
   QUnit.test("outlet should support an optional view class", function() {
-    var template = "<h1>HI</h1>{{outlet viewClass=view.outletView}}";
-    view = EmberView['default'].create({
-      template: compile['default'](template),
-      outletView: EmberContainerView['default'].extend()
-    });
+    var CoreOutlet = container.lookupFactory('view:core-outlet');
+    var SpecialOutlet = CoreOutlet.extend({
+      classNames: ['very-special']
+    });
+    var routerState = {
+      render: {
+        ViewClass: EmberView['default'].extend({
+          template: compile['default']("<h1>HI</h1>{{outlet viewClass=view.outletView}}"),
+          outletView: SpecialOutlet
+        })
+      },
+      outlets: {}
+    };
+    top.setOutletState(routerState);
 
-    utils.runAppend(view);
+    utils.runAppend(top);
 
-    equal(view.$().text(), 'HI');
+    equal(top.$().text(), 'HI');
+    equal(top.$().find('.very-special').length, 1, "Should find .very-special");
 
-    var childView = EmberView['default'].create({
-      template: compile['default']("<p>BYE</p>")
-    });
+    routerState.outlets.main = withTemplate("<p>BYE</p>");
 
     run['default'](function() {
-      view.connectOutlet('main', childView);
+      top.setOutletState(routerState);
     });
 
-    ok(view.outletView.detectInstance(childView._parentView), "The custom view class should be used for the outlet");
-
     // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HIBYE');
+    equal(trim(top.$().text()), 'HIBYE');
   });
 
 
   QUnit.test("Outlets bind to the current view, not the current concrete view", function() {
-    var parentTemplate = "<h1>HI</h1>{{outlet}}";
-    var middleTemplate = "<h2>MIDDLE</h2>{{outlet}}";
-    var bottomTemplate = "<h3>BOTTOM</h3>";
-
-    view = EmberView['default'].create({
-      template: compile['default'](parentTemplate)
-    });
-
-    var middleView = _MetamorphView['default'].create({
-      template: compile['default'](middleTemplate)
-    });
-
-    var bottomView = _MetamorphView['default'].create({
-      template: compile['default'](bottomTemplate)
-    });
-
-    utils.runAppend(view);
-
+    var routerState = withTemplate("<h1>HI</h1>{{outlet}}");
+    top.setOutletState(routerState);
+    utils.runAppend(top);
+    routerState.outlets.main = withTemplate("<h2>MIDDLE</h2>{{outlet}}");
     run['default'](function() {
-      view.connectOutlet('main', middleView);
+      top.setOutletState(routerState);
     });
-
+    routerState.outlets.main.outlets.main = withTemplate("<h3>BOTTOM</h3>");
     run['default'](function() {
-      middleView.connectOutlet('main', bottomView);
+      top.setOutletState(routerState);
     });
 
     var output = jQuery['default']('#qunit-fixture h1 ~ h2 ~ h3').text();
     equal(output, "BOTTOM", "all templates were rendered");
   });
 
-  QUnit.test("view should support disconnectOutlet for the main outlet", function() {
-    var template = "<h1>HI</h1>{{outlet}}";
-    view = EmberView['default'].create({
-      template: compile['default'](template)
-    });
-
-    utils.runAppend(view);
-
-    equal(view.$().text(), 'HI');
-
-    run['default'](function() {
-      view.connectOutlet('main', EmberView['default'].create({
-        template: compile['default']("<p>BYE</p>")
-      }));
-    });
-
-    // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HIBYE');
-
-    run['default'](function() {
-      view.disconnectOutlet('main');
-    });
-
-    // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HI');
-  });
-
-  // TODO: Remove flag when {{with}} is fixed.
-  if (!Ember['default'].FEATURES.isEnabled('ember-htmlbars')) {
-  // jscs:disable validateIndentation
-
   QUnit.test("Outlets bind to the current template's view, not inner contexts [DEPRECATED]", function() {
-    var parentTemplate = "<h1>HI</h1>{{#if view.alwaysTrue}}{{#with this}}{{outlet}}{{/with}}{{/if}}";
+    var parentTemplate = "<h1>HI</h1>{{#if view.alwaysTrue}}{{outlet}}{{/if}}";
     var bottomTemplate = "<h3>BOTTOM</h3>";
 
-    view = EmberView['default'].create({
-      alwaysTrue: true,
-      template: compile['default'](parentTemplate)
-    });
+    var routerState = {
+      render: {
+        ViewClass: EmberView['default'].extend({
+          alwaysTrue: true,
+          template: compile['default'](parentTemplate)
+        })
+      },
+      outlets: {}
+    };
 
-    var bottomView = _MetamorphView['default'].create({
-      template: compile['default'](bottomTemplate)
-    });
+    top.setOutletState(routerState);
 
-    expectDeprecation(function() {
-      utils.runAppend(view);
-    }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
+    utils.runAppend(top);
+
+    routerState.outlets.main = withTemplate(bottomTemplate);
 
     run['default'](function() {
-      view.connectOutlet('main', bottomView);
+      top.setOutletState(routerState);
     });
 
     var output = jQuery['default']('#qunit-fixture h1 ~ h3').text();
     equal(output, "BOTTOM", "all templates were rendered");
   });
 
-  // jscs:enable validateIndentation
-  }
-
   QUnit.test("should support layouts", function() {
     var template = "{{outlet}}";
     var layout = "<h1>HI</h1>{{yield}}";
+    var routerState = {
+      render: {
+        ViewClass: EmberView['default'].extend({
+          template: compile['default'](template),
+          layout: compile['default'](layout)
+        })
+      },
+      outlets: {}
+    };
+    top.setOutletState(routerState);
+    utils.runAppend(top);
 
-    view = EmberView['default'].create({
-      template: compile['default'](template),
-      layout: compile['default'](layout)
-    });
-
-    utils.runAppend(view);
+    equal(top.$().text(), 'HI');
 
-    equal(view.$().text(), 'HI');
+    routerState.outlets.main = withTemplate("<p>BYE</p>");
 
     run['default'](function() {
-      view.connectOutlet('main', EmberView['default'].create({
-        template: compile['default']("<p>BYE</p>")
-      }));
+      top.setOutletState(routerState);
     });
+
     // Replace whitespace for older IE
-    equal(trim(view.$().text()), 'HIBYE');
+    equal(trim(top.$().text()), 'HIBYE');
   });
 
   QUnit.test("should not throw deprecations if {{outlet}} is used without a name", function() {
     expectNoDeprecation();
-    view = EmberView['default'].create({
-      template: compile['default']("{{outlet}}")
-    });
-    utils.runAppend(view);
+    top.setOutletState(withTemplate("{{outlet}}"));
+    utils.runAppend(top);
   });
 
   QUnit.test("should not throw deprecations if {{outlet}} is used with a quoted name", function() {
     expectNoDeprecation();
-    view = EmberView['default'].create({
-      template: compile['default']("{{outlet \"foo\"}}")
-    });
-    utils.runAppend(view);
+    top.setOutletState(withTemplate("{{outlet \"foo\"}}"));
+    utils.runAppend(top);
   });
 
-  
-    QUnit.test("should throw an assertion if {{outlet}} used with unquoted name", function() {
-      view = EmberView['default'].create({
-        template: compile['default']("{{outlet foo}}")
-      });
-      expectAssertion(function() {
-        utils.runAppend(view);
-      }, "Using {{outlet}} with an unquoted name is not supported.");
-    });
-  
+  QUnit.test("should throw an assertion if {{outlet}} used with unquoted name", function() {
+    top.setOutletState(withTemplate("{{outlet foo}}"));
+    expectAssertion(function() {
+      utils.runAppend(top);
+    }, "Using {{outlet}} with an unquoted name is not supported.");
+  });
+
+  function withTemplate(string) {
+    return {
+      render: {
+        template: compile['default'](string)
+      },
+      outlets: {}
+    };
+  }
+
 });
 enifed('ember-routing-htmlbars/tests/helpers/outlet_test.jscs-test', function () {
 
@@ -30825,7 +30164,7 @@ enifed('ember-routing-htmlbars/tests/helpers/outlet_test.jshint', function () {
   });
 
 });
-enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core', 'ember-metal/property_set', 'ember-metal/run_loop', 'ember-metal/platform/define_property', 'ember-metal/mixin', 'ember-runtime/system/namespace', 'ember-runtime/controllers/controller', 'ember-runtime/controllers/array_controller', 'ember-htmlbars/helpers', 'ember-template-compiler/system/compile', 'ember-routing/ext/view', 'ember-views/system/jquery', 'ember-views/system/action_manager', 'ember-routing-htmlbars/helpers/render', 'ember-routing-htmlbars/helpers/action', 'ember-routing-htmlbars/helpers/outlet', 'ember-routing-htmlbars/tests/utils', 'ember-runtime/tests/utils'], function (Ember, property_set, run, define_property, mixin, Namespace, controllers__controller, EmberArrayController, helpers, compile, EmberView, jQuery, ActionManager, render, helpers__action, outlet, utils, tests__utils) {
+enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core', 'ember-metal/property_set', 'ember-metal/run_loop', 'ember-metal/platform/define_property', 'ember-metal/mixin', 'ember-runtime/system/namespace', 'ember-runtime/controllers/controller', 'ember-runtime/controllers/array_controller', 'ember-htmlbars/helpers', 'ember-template-compiler/system/compile', 'ember-views/views/view', 'ember-views/system/jquery', 'ember-views/system/action_manager', 'ember-routing-htmlbars/helpers/render', 'ember-routing-htmlbars/helpers/action', 'ember-routing-htmlbars/helpers/outlet', 'ember-routing-htmlbars/tests/utils', 'ember-runtime/tests/utils'], function (Ember, property_set, run, define_property, mixin, Namespace, controllers__controller, EmberArrayController, helpers, compile, EmberView, jQuery, ActionManager, render, helpers__action, outlet, utils, tests__utils) {
 
   'use strict';
 
@@ -31232,30 +30571,40 @@ enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core',
   });
 
   QUnit.test("{{render}} helper should be able to render a template again when it was removed", function() {
-    var template = "<h1>HI</h1>{{outlet}}";
     var controller = controllers__controller["default"].extend({ container: container });
-    view = EmberView['default'].create({
-      template: compile['default'](template)
-    });
+    var CoreOutlet = container.lookupFactory('view:core-outlet');
+    view = CoreOutlet.create();
+    tests__utils.runAppend(view);
 
     Ember['default'].TEMPLATES['home'] = compile['default']("<p>BYE</p>");
 
-    tests__utils.runAppend(view);
+    var liveRoutes = {
+      render: {
+        template: compile['default']("<h1>HI</h1>{{outlet}}")
+      },
+      outlets: {}
+    };
 
     run['default'](function() {
-      view.connectOutlet('main', EmberView['default'].create({
-        controller: controller.create(),
-        template: compile['default']("<div>1{{render 'home'}}</div>")
-      }));
+      liveRoutes.outlets.main = {
+        render: {
+          controller: controller.create(),
+          template: compile['default']("<div>1{{render 'home'}}</div>")
+        }
+      };
+      view.setOutletState(liveRoutes);
     });
 
     equal(view.$().text(), 'HI1BYE');
 
     run['default'](function() {
-      view.connectOutlet('main', EmberView['default'].create({
-        controller: controller.create(),
-        template: compile['default']("<div>2{{render 'home'}}</div>")
-      }));
+      liveRoutes.outlets.main = {
+        render: {
+          controller: controller.create(),
+          template: compile['default']("<div>2{{render 'home'}}</div>")
+        }
+      };
+      view.setOutletState(liveRoutes);
     });
 
     equal(view.$().text(), 'HI2BYE');
@@ -31301,9 +30650,6 @@ enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core',
     equal(container.lookup('controller:blog.post'), renderedView.get('controller'), 'rendered with correct controller');
   });
 
-  
-  // jscs:disable validateIndentation
-
   QUnit.test("throws an assertion if {{render}} is called with an unquoted template name", function() {
     var template = '<h1>HI</h1>{{render home}}';
     var controller = controllers__controller["default"].extend({ container: container });
@@ -31334,8 +30680,6 @@ 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}}.");
   });
 
-  // jscs:enable validateIndentation
-  
 });
 enifed('ember-routing-htmlbars/tests/helpers/render_test.jscs-test', function () {
 
@@ -31357,7 +30701,7 @@ enifed('ember-routing-htmlbars/tests/helpers/render_test.jshint', function () {
   });
 
 });
-enifed('ember-routing-htmlbars/tests/utils', ['exports', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/string', 'container/registry', 'ember-runtime/controllers/controller', 'ember-runtime/controllers/object_controller', 'ember-runtime/controllers/array_controller', 'ember-views/views/metamorph_view', 'ember-routing/system/router', 'ember-routing/location/hash_location'], function (exports, property_get, property_set, string, Registry, Controller, ObjectController, ArrayController, _MetamorphView, EmberRouter, HashLocation) {
+enifed('ember-routing-htmlbars/tests/utils', ['exports', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/string', 'container/registry', 'ember-runtime/controllers/controller', 'ember-runtime/controllers/object_controller', 'ember-runtime/controllers/array_controller', 'ember-views/views/metamorph_view', 'ember-views/views/view', 'ember-routing/system/router', 'ember-routing-views/views/outlet', 'ember-routing/location/hash_location'], function (exports, property_get, property_set, string, Registry, Controller, ObjectController, ArrayController, _MetamorphView, EmberView, EmberRouter, outlet, HashLocation) {
 
   'use strict';
 
@@ -31401,6 +30745,9 @@ enifed('ember-routing-htmlbars/tests/utils', ['exports', 'ember-metal/property_g
     registry.register("controller:array", ArrayController['default'], { instantiate: false });
 
     registry.register("view:default", _MetamorphView['default']);
+    registry.register("view:toplevel", EmberView['default'].extend());
+    registry.register("view:-outlet", outlet.OutletView);
+    registry.register("view:core-outlet", outlet.CoreOutletView);
     registry.register("router:main", EmberRouter['default'].extend());
 
     registry.typeInjection("route", "router", "router:main");
@@ -31449,7 +30796,7 @@ enifed('ember-routing-views.jshint', function () {
   });
 
 });
-enifed('ember-routing-views/tests/main_test', ['ember-routing-views', 'ember-metal/core'], function (__dep0__, Ember) {
+enifed('ember-routing-views/tests/main_test', ['ember-metal/core'], function (Ember) {
 
   'use strict';
 
@@ -31580,26 +30927,6 @@ enifed('ember-routing/ext/run_loop.jshint', function () {
     ok(true, 'ember-routing/ext/run_loop.js should pass jshint.'); 
   });
 
-});
-enifed('ember-routing/ext/view.jscs-test', function () {
-
-  'use strict';
-
-  module('JSCS - ember-routing/ext');
-  test('ember-routing/ext/view.js should pass jscs', function() {
-    ok(true, 'ember-routing/ext/view.js should pass jscs.');
-  });
-
-});
-enifed('ember-routing/ext/view.jshint', function () {
-
-  'use strict';
-
-  module('JSHint - ember-routing/ext');
-  test('ember-routing/ext/view.js should pass jshint', function() { 
-    ok(true, 'ember-routing/ext/view.js should pass jshint.'); 
-  });
-
 });
 enifed('ember-routing/location/api.jscs-test', function () {
 
@@ -52610,9 +51937,6 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
 
   'use strict';
 
-  
-  // jscs:disable validateIndentation
-
   QUnit.module('ember-htmlbars: compile');
 
   QUnit.test('compiles the provided template with htmlbars', function() {
@@ -52633,8 +51957,22 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
     ok(actual.isMethod === false, 'sets isMethod via template function');
   });
 
-  // jscs:enable validateIndentation
-  
+  QUnit.test('includes the current revision in the compiled template', function() {
+    var templateString = "{{foo}} -- {{some-bar blah='foo'}}";
+
+    var actual = compile['default'](templateString);
+
+    equal(actual.revision, 'Ember@1.11.0-beta.2', 'revision is included in generated template');
+  });
+
+  QUnit.test('the template revision is different than the HTMLBars default revision', function() {
+    var templateString = "{{foo}} -- {{some-bar blah='foo'}}";
+
+    var actual = compile['default'](templateString);
+    var expected = compiler.compile(templateString);
+
+    ok(actual.revision !== expected.revision, 'revision differs from default');
+  });
 
 });
 enifed('ember-template-compiler/tests/system/compile_test.jscs-test', function () {
@@ -52661,9 +51999,6 @@ enifed('ember-template-compiler/tests/system/template_test', ['ember-template-co
 
   'use strict';
 
-  
-  // jscs:disable validateIndentation
-
   QUnit.module('ember-htmlbars: template');
 
   QUnit.test('sets `isTop` on the provided function', function() {
@@ -52682,9 +52017,6 @@ enifed('ember-template-compiler/tests/system/template_test', ['ember-template-co
     equal(test.isMethod, false, 'sets isMethod on the provided function');
   });
 
-  // jscs:enable validateIndentation
-  
-
 });
 enifed('ember-template-compiler/tests/system/template_test.jscs-test', function () {
 
@@ -53572,11 +52904,7 @@ enifed('ember-testing/tests/helpers_test', ['ember-metal/core', 'ember-metal/run
     checkHelperPresent('wait', expected);
     checkHelperPresent('triggerEvent', expected);
 
-    if (Ember['default'].FEATURES.isEnabled('ember-testing-checkbox-helpers')) {
-      checkHelperPresent('check', expected);
-      checkHelperPresent('uncheck', expected);
-    }
-  }
+      }
 
   function assertNoHelpers(application, helperContainer) {
     assertHelpers(application, helperContainer, false);
@@ -54095,94 +53423,7 @@ enifed('ember-testing/tests/helpers_test', ['ember-metal/core', 'ember-metal/run
     });
   });
 
-  if (Ember['default'].FEATURES.isEnabled('ember-testing-checkbox-helpers')) {
-    QUnit.test("`check` ensures checkboxes are `checked` state for checkboxes", function() {
-      expect(2);
-      var check, find, visit, andThen;
-
-      App.IndexView = EmberView['default'].extend({
-        template: compile['default']('<input type="checkbox" id="unchecked"><input type="checkbox" id="checked" checked>')
-      });
-
-      run['default'](App, App.advanceReadiness);
-
-      check = App.testHelpers.check;
-      find = App.testHelpers.find;
-      visit = App.testHelpers.visit;
-      andThen = App.testHelpers.andThen;
-
-      visit('/');
-      check('#unchecked');
-      check('#checked');
-      andThen(function() {
-        equal(find('#unchecked').is(":checked"), true, "can check an unchecked checkbox");
-        equal(find('#checked').is(":checked"), true, "can check a checked checkbox");
-      });
-    });
-
-    QUnit.test("`uncheck` ensures checkboxes are not `checked`", function() {
-      expect(2);
-      var uncheck, find, visit, andThen;
-
-      App.IndexView = EmberView['default'].extend({
-        template: compile['default']('<input type="checkbox" id="unchecked"><input type="checkbox" id="checked" checked>')
-      });
-
-      run['default'](App, App.advanceReadiness);
-
-      uncheck = App.testHelpers.uncheck;
-      find = App.testHelpers.find;
-      visit = App.testHelpers.visit;
-      andThen = App.testHelpers.andThen;
-
-      visit('/');
-      uncheck('#unchecked');
-      uncheck('#checked');
-      andThen(function() {
-        equal(find('#unchecked').is(":checked"), false, "can uncheck an unchecked checkbox");
-        equal(find('#checked').is(":checked"), false, "can uncheck a checked checkbox");
-      });
-    });
-
-    QUnit.test("`check` asserts the selected inputs are checkboxes", function() {
-      var check, visit;
-
-      App.IndexView = EmberView['default'].extend({
-        template: compile['default']('<input type="text" id="text">')
-      });
-
-      run['default'](App, App.advanceReadiness);
-
-      check = App.testHelpers.check;
-      visit = App.testHelpers.visit;
-
-      visit('/').then(function() {
-        expectAssertion(function() {
-          check('#text');
-        }, /must be a checkbox/);
-      });
-    });
-
-    QUnit.test("`uncheck` asserts the selected inputs are checkboxes", function() {
-      var visit, uncheck;
-
-      App.IndexView = EmberView['default'].extend({
-        template: compile['default']('<input type="text" id="text">')
-      });
-
-      run['default'](App, App.advanceReadiness);
-
-      visit = App.testHelpers.visit;
-      uncheck = App.testHelpers.uncheck;
-
-      visit('/').then(function() {
-        expectAssertion(function() {
-          uncheck('#text');
-        }, /must be a checkbox/);
-      });
-    });
-  }
-
+  
   QUnit.test("`triggerEvent accepts an optional options hash and context", function() {
     expect(3);
 
@@ -54760,6 +54001,46 @@ enifed('ember-views/component_lookup.jshint', function () {
     ok(true, 'ember-views/component_lookup.js should pass jshint.'); 
   });
 
+});
+enifed('ember-views/mixins/attribute_bindings_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/attribute_bindings_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/attribute_bindings_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/attribute_bindings_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/attribute_bindings_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/attribute_bindings_support.js should pass jshint.'); 
+  });
+
+});
+enifed('ember-views/mixins/class_names_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/class_names_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/class_names_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/class_names_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/class_names_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/class_names_support.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-views/mixins/component_template_deprecation.jscs-test', function () {
 
@@ -54780,6 +54061,46 @@ enifed('ember-views/mixins/component_template_deprecation.jshint', function () {
     ok(true, 'ember-views/mixins/component_template_deprecation.js should pass jshint.'); 
   });
 
+});
+enifed('ember-views/mixins/instrumentation_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/instrumentation_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/instrumentation_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/instrumentation_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/instrumentation_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/instrumentation_support.js should pass jshint.'); 
+  });
+
+});
+enifed('ember-views/mixins/legacy_view_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/legacy_view_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/legacy_view_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/legacy_view_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/legacy_view_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/legacy_view_support.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-views/mixins/normalized_rerender_if_needed.jscs-test', function () {
 
@@ -54800,6 +54121,26 @@ enifed('ember-views/mixins/normalized_rerender_if_needed.jshint', function () {
     ok(true, 'ember-views/mixins/normalized_rerender_if_needed.js should pass jshint.'); 
   });
 
+});
+enifed('ember-views/mixins/template_rendering_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/template_rendering_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/template_rendering_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/template_rendering_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/template_rendering_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/template_rendering_support.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-views/mixins/text_support.jscs-test', function () {
 
@@ -54820,6 +54161,106 @@ enifed('ember-views/mixins/text_support.jshint', function () {
     ok(true, 'ember-views/mixins/text_support.js should pass jshint.'); 
   });
 
+});
+enifed('ember-views/mixins/view_child_views_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/view_child_views_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/view_child_views_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/view_child_views_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/view_child_views_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/view_child_views_support.js should pass jshint.'); 
+  });
+
+});
+enifed('ember-views/mixins/view_context_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/view_context_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/view_context_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/view_context_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/view_context_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/view_context_support.js should pass jshint.'); 
+  });
+
+});
+enifed('ember-views/mixins/view_keyword_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/view_keyword_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/view_keyword_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/view_keyword_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/view_keyword_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/view_keyword_support.js should pass jshint.'); 
+  });
+
+});
+enifed('ember-views/mixins/view_state_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/view_state_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/view_state_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/view_state_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/view_state_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/view_state_support.js should pass jshint.'); 
+  });
+
+});
+enifed('ember-views/mixins/view_stream_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/view_stream_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/view_stream_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/view_stream_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/view_stream_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/view_stream_support.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-views/mixins/view_target_action_support.jscs-test', function () {
 
@@ -54840,6 +54281,26 @@ enifed('ember-views/mixins/view_target_action_support.jshint', function () {
     ok(true, 'ember-views/mixins/view_target_action_support.js should pass jshint.'); 
   });
 
+});
+enifed('ember-views/mixins/visibility_support.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-views/mixins');
+  test('ember-views/mixins/visibility_support.js should pass jscs', function() {
+    ok(true, 'ember-views/mixins/visibility_support.js should pass jscs.');
+  });
+
+});
+enifed('ember-views/mixins/visibility_support.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-views/mixins');
+  test('ember-views/mixins/visibility_support.js should pass jshint', function() { 
+    ok(true, 'ember-views/mixins/visibility_support.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-views/streams/class_name_binding.jscs-test', function () {
 
@@ -57866,7 +57327,7 @@ enifed('ember-views/tests/views/container_view_test', ['ember-metal/property_get
       container.removeObject(view);
     });
     equal(property_get.get(view, 'childViews.length'), 0, "child views are cleared when removed from container view");
-    equal(container.$().html(), '', "the child view is removed from the DOM");
+    equal(container.$().text(), '', "the child view is removed from the DOM");
   });
 
   QUnit.test("if a ContainerView starts with an empty currentView, nothing is displayed", function() {
@@ -65384,7 +64845,9 @@ enifed('ember/tests/component_registration_test', ['ember', 'ember-template-comp
 
   function cleanup() {
     Ember.run(function() {
-      App.destroy();
+      if (App) {
+        App.destroy();
+      }
       App = null;
       Ember.TEMPLATES = {};
 
@@ -65549,21 +65012,14 @@ enifed('ember/tests/component_registration_test', ['ember', 'ember-template-comp
     equal(Ember.$('#wrapper').text(), "inner-outer", "The component is composed correctly");
   });
 
-  if (!Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  // jscs:disable validateIndentation
-    // ember-htmlbars doesn't throw an exception when a helper is not found
-
   QUnit.test('Using name of component that does not exist', function () {
     Ember.TEMPLATES.application = compile['default']("<div id='wrapper'>{{#no-good}} {{/no-good}}</div>");
 
-    throws(function () {
+    expectAssertion(function () {
       boot();
-    }, /Could not find component or helper named 'no-good'/);
+    }, /A helper named `no-good` could not be found/);
   });
 
-  // jscs:enable validateIndentation
-  }
-
   QUnit.module("Application Lifecycle - Component Context", {
     setup: prepare,
     teardown: cleanup
@@ -65777,7 +65233,10 @@ enifed('ember/tests/helpers/helper_registration_test', ['ember', 'ember-htmlbars
   QUnit.module("Application Lifecycle - Helper Registration", {
     teardown: function() {
       Ember.run(function() {
-        App.destroy();
+        if (App) {
+          App.destroy();
+        }
+
         App = null;
         Ember.TEMPLATES = {};
       });
@@ -65840,41 +65299,28 @@ 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");
   });
 
-  if (!Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  // jscs:disable validateIndentation
-
     // 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() {
 
-    var realHelperMissing = helpers.helperMissing;
-    helpers.helperMissing = function() {
-      return "NOHALPER";
-    };
-
     // Note: the reason we're not allowing undashed helpers is to avoid
     // a possible perf hit in hot code paths, i.e. _triageMustache.
     // We only presently perform container lookups if prop.indexOf('-') >= 0
 
     Ember.TEMPLATES.application = compile("<div id='wrapper'>{{omg}}|{{omg 'GRRR'}}|{{yorp}}|{{yorp 'ahh'}}</div>");
 
-    boot(function() {
-      registry.register('helper:omg', function() {
-        return "OMG";
+    expectAssertion(function() {
+      boot(function() {
+        registry.register('helper:omg', function() {
+          return "OMG";
+        });
+        registry.register('helper:yorp', makeBoundHelper(function() {
+          return "YORP";
+        }));
       });
-      registry.register('helper:yorp', makeBoundHelper(function() {
-        return "YORP";
-      }));
-    });
-
-    equal(Ember.$('#wrapper').text(), "|NOHALPER||NOHALPER", "The undashed helper was invoked from the container");
-
-    helpers.helperMissing = realHelperMissing;
+    }, /A helper named 'omg' could not be found/);
   });
 
-  // jscs:enable validateIndentation
-  }
-
 });
 enifed('ember/tests/helpers/helper_registration_test.jscs-test', function () {
 
@@ -68018,28 +67464,6 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
     equal(Ember.$('h3:contains(Hours)', '#qunit-fixture').length, 1, "The home template was rendered");
   });
 
-  QUnit.test("The Homepage register as activeView", function() {
-    Router.map(function() {
-      this.route("home", { path: "/" });
-      this.route("homepage");
-    });
-
-    App.HomeRoute = Ember.Route.extend({
-    });
-
-    App.HomepageRoute = Ember.Route.extend({
-    });
-
-    bootApplication();
-
-    ok(router._lookupActiveView('home'), '`home` active view is connected');
-
-    handleURL('/homepage');
-
-    ok(router._lookupActiveView('homepage'), '`homepage` active view is connected');
-    equal(router._lookupActiveView('home'), undefined, '`home` active view is disconnected');
-  });
-
   QUnit.test("The Homepage with explicit template name in renderTemplate", function() {
     Router.map(function() {
       this.route("home", { path: "/" });
@@ -70416,6 +69840,22 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
   });
 
 
+  QUnit.test("Route will assert if you try to explicitly render {into: ...} a missing template", function () {
+    Router.map(function() {
+      this.route("home", { path: "/" });
+    });
+
+    App.HomeRoute = Ember.Route.extend({
+      renderTemplate: function() {
+        this.render({ into: 'nonexistent' });
+      }
+    });
+
+    expectAssertion(function() {
+      bootApplication();
+    }, "You attempted to render into 'nonexistent' but it was not found");
+  });
+
   QUnit.test("Route supports clearing outlet explicitly", function() {
     Ember.TEMPLATES.application = compile("{{outlet}}{{outlet 'modal'}}");
     Ember.TEMPLATES.posts = compile("{{outlet}}");
@@ -71285,6 +70725,160 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
     }, /\bboom\b/);
   });
 
+  QUnit.test("{{outlet}} works when created after initial render", function() {
+    Ember.TEMPLATES.sample = compile("Hi{{#if showTheThing}}{{outlet}}{{/if}}Bye");
+    Ember.TEMPLATES['sample/inner'] = compile("Yay");
+    Ember.TEMPLATES['sample/inner2'] = compile("Boo");
+    Router.map(function() {
+      this.route('sample', { path: '/' }, function() {
+        this.route('inner', { path: '/' });
+        this.route('inner2', { path: '/2' });
+      });
+    });
+
+    bootApplication();
+
+    equal(Ember.$('#qunit-fixture').text(), "HiBye", "initial render");
+
+    Ember.run(function() {
+      container.lookup('controller:sample').set('showTheThing', true);
+    });
+
+    equal(Ember.$('#qunit-fixture').text(), "HiYayBye", "second render");
+
+    handleURL('/2');
+
+    equal(Ember.$('#qunit-fixture').text(), "HiBooBye", "third render");
+  });
+
+  QUnit.test("Can rerender application view multiple times when it contains an outlet", function() {
+    Ember.TEMPLATES.application = compile("App{{outlet}}");
+    Ember.TEMPLATES.index = compile("Hello world");
+
+    registry.register('view:application', Ember.View.extend({
+      elementId: 'im-special'
+    }));
+
+    bootApplication();
+
+    equal(Ember.$('#qunit-fixture').text(), "AppHello world", "initial render");
+
+    Ember.run(function() {
+      Ember.View.views['im-special'].rerender();
+    });
+
+    equal(Ember.$('#qunit-fixture').text(), "AppHello world", "second render");
+
+    Ember.run(function() {
+      Ember.View.views['im-special'].rerender();
+    });
+
+    equal(Ember.$('#qunit-fixture').text(), "AppHello world", "third render");
+  });
+
+  QUnit.test("Can render into a named outlet at the top level", function() {
+    Ember.TEMPLATES.application = compile("A-{{outlet}}-B-{{outlet \"other\"}}-C");
+    Ember.TEMPLATES.modal = compile("Hello world");
+    Ember.TEMPLATES.index = compile("The index");
+
+    registry.register('route:application', Ember.Route.extend({
+      renderTemplate: function() {
+        this.render();
+        this.render('modal', {
+          into: 'application',
+          outlet: 'other'
+        });
+      }
+    }));
+
+    bootApplication();
+
+    equal(Ember.$('#qunit-fixture').text(), "A-The index-B-Hello world-C", "initial render");
+  });
+
+  QUnit.test("Can disconnect a named outlet at the top level", function() {
+    Ember.TEMPLATES.application = compile("A-{{outlet}}-B-{{outlet \"other\"}}-C");
+    Ember.TEMPLATES.modal = compile("Hello world");
+    Ember.TEMPLATES.index = compile("The index");
+
+    registry.register('route:application', Ember.Route.extend({
+      renderTemplate: function() {
+        this.render();
+        this.render('modal', {
+          into: 'application',
+          outlet: 'other'
+        });
+      },
+      actions: {
+        banish: function() {
+          this.disconnectOutlet({
+            parentView: 'application',
+            outlet: 'other'
+          });
+        }
+      }
+    }));
+
+    bootApplication();
+
+    equal(Ember.$('#qunit-fixture').text(), "A-The index-B-Hello world-C", "initial render");
+
+    Ember.run(router, 'send', 'banish');
+
+    equal(Ember.$('#qunit-fixture').text(), "A-The index-B--C", "second render");
+  });
+
+  QUnit.test("Can render into a named outlet at the top level, with empty main outlet", function() {
+    Ember.TEMPLATES.application = compile("A-{{outlet}}-B-{{outlet \"other\"}}-C");
+    Ember.TEMPLATES.modal = compile("Hello world");
+
+    Router.map(function() {
+      this.route('hasNoTemplate', { path: '/' });
+    });
+
+    registry.register('route:application', Ember.Route.extend({
+      renderTemplate: function() {
+        this.render();
+        this.render('modal', {
+          into: 'application',
+          outlet: 'other'
+        });
+      }
+    }));
+
+    bootApplication();
+
+    equal(Ember.$('#qunit-fixture').text(), "A--B-Hello world-C", "initial render");
+  });
+
+
+  QUnit.test("Can render into a named outlet at the top level, later", function() {
+    Ember.TEMPLATES.application = compile("A-{{outlet}}-B-{{outlet \"other\"}}-C");
+    Ember.TEMPLATES.modal = compile("Hello world");
+    Ember.TEMPLATES.index = compile("The index");
+
+    registry.register('route:application', Ember.Route.extend({
+      actions: {
+        launch: function() {
+          this.render('modal', {
+            into: 'application',
+            outlet: 'other'
+          });
+        }
+      }
+    }));
+
+    bootApplication();
+
+    equal(Ember.$('#qunit-fixture').text(), "A-The index-B--C", "initial render");
+
+    Ember.run(router, 'send', 'launch');
+
+    //debugger;
+    //router._setOutlets();
+    equal(Ember.$('#qunit-fixture').text(), "A-The index-B-Hello world-C", "second render");
+  });
+
 });
 enifed('ember/tests/routing/basic_test.jscs-test', function () {