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

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.7.0-beta.1
+ * @version   1.7.0-beta.2
  */
 
 (function() {
@@ -2881,7 +2881,7 @@ define("ember-extension-support/tests/container_debug_adapter_test",
     var Ember = __dependency1__["default"];
     var run = __dependency2__["default"];
     var EmberObject = __dependency3__["default"];
-    var EmberController = __dependency4__.default;
+    var EmberController = __dependency4__["default"];
     // Must be required to export Ember.ContainerDebugAdapter
     var Application = __dependency6__["default"];
 
@@ -2953,7 +2953,7 @@ define("ember-extension-support/tests/data_adapter_test",
     var addObserver = __dependency5__.addObserver;
     var removeObserver = __dependency5__.removeObserver;
     var EmberObject = __dependency6__["default"];
-    var EmberController = __dependency7__.default;
+    var EmberController = __dependency7__["default"];
     var EmberDataAdapter = __dependency8__["default"];
     var EmberApplication = __dependency9__["default"];
     var DefaultResolver = __dependency10__["default"];
@@ -5411,8 +5411,8 @@ define("ember-handlebars/tests/controls/text_field_test.jshint",
     });
   });
 define("ember-handlebars/tests/handlebars_test",
-  ["ember-metal/core","ember-views/system/jquery","ember-metal/enumerable_utils","ember-metal/run_loop","ember-runtime/system/namespace","ember-views/views/view","ember-handlebars","ember-runtime/system/object","ember-runtime/controllers/object_controller","ember-runtime/system/native_array","ember-metal/computed","ember-runtime/system/string","ember-metal/utils","ember-runtime/system/array_proxy","ember-views/views/collection_view","ember-views/views/container_view","ember-metal/binding","ember-metal/observer","ember-handlebars/controls/text_field","ember-runtime/system/container","ember-metal/logger","ember-handlebars/string","ember-metal/property_get","ember-metal/property_set"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__) {
+  ["ember-metal/core","ember-views/system/jquery","ember-metal/enumerable_utils","ember-metal/run_loop","ember-runtime/system/namespace","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-handlebars","ember-runtime/system/object","ember-runtime/controllers/object_controller","ember-runtime/system/native_array","ember-metal/computed","ember-runtime/system/string","ember-metal/utils","ember-runtime/system/array_proxy","ember-views/views/collection_view","ember-views/views/container_view","ember-metal/binding","ember-metal/observer","ember-handlebars/controls/text_field","ember-runtime/system/container","ember-metal/logger","ember-handlebars/string","ember-metal/property_get","ember-metal/property_set"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__) {
     "use strict";
     /*globals TemplateTests:true,MyApp:true,App:true,Ember:true */
 
@@ -5425,23 +5425,24 @@ define("ember-handlebars/tests/handlebars_test",
     var run = __dependency4__["default"];
     var Namespace = __dependency5__["default"];
     var EmberView = __dependency6__["default"];
-    var EmberHandlebars = __dependency7__["default"];
-    var EmberObject = __dependency8__["default"];
-    var ObjectController = __dependency9__["default"];
-    var A = __dependency10__.A;
-    var computed = __dependency11__.computed;
-    var fmt = __dependency12__.fmt;
-    var typeOf = __dependency13__.typeOf;
-    var ArrayProxy = __dependency14__["default"];
-    var CollectionView = __dependency15__["default"];
-    var ContainerView = __dependency16__["default"];
-    var Binding = __dependency17__.Binding;
-    var observersFor = __dependency18__.observersFor;
-    var TextField = __dependency19__["default"];
-    var Container = __dependency20__["default"];
-    var Logger = __dependency21__["default"];
-
-    var htmlSafe = __dependency22__["default"];
+    var _MetamorphView = __dependency7__["default"];
+    var EmberHandlebars = __dependency8__["default"];
+    var EmberObject = __dependency9__["default"];
+    var ObjectController = __dependency10__["default"];
+    var A = __dependency11__.A;
+    var computed = __dependency12__.computed;
+    var fmt = __dependency13__.fmt;
+    var typeOf = __dependency14__.typeOf;
+    var ArrayProxy = __dependency15__["default"];
+    var CollectionView = __dependency16__["default"];
+    var ContainerView = __dependency17__["default"];
+    var Binding = __dependency18__.Binding;
+    var observersFor = __dependency19__.observersFor;
+    var TextField = __dependency20__["default"];
+    var Container = __dependency21__["default"];
+    var Logger = __dependency22__["default"];
+
+    var htmlSafe = __dependency23__["default"];
 
     // for global lookups in template. :(
     Ember.View = EmberView;
@@ -5450,8 +5451,8 @@ define("ember-handlebars/tests/handlebars_test",
 
     var trim = jQuery.trim;
 
-    var get = __dependency23__.get;
-    var set = __dependency24__.set;
+    var get = __dependency24__.get;
+    var set = __dependency25__.set;
 
     function firstGrandchild(view) {
       return get(get(view, 'childViews').objectAt(0), 'childViews').objectAt(0);
@@ -5524,7 +5525,8 @@ define("ember-handlebars/tests/handlebars_test",
 
         container = new Container();
         container.optionsForType('template', { instantiate: false });
-        container.register('view:default', EmberView.extend());
+        container.register('view:default', _MetamorphView);
+        container.register('view:toplevel', EmberView.extend());
       },
 
       teardown: function() {
@@ -8524,8 +8526,8 @@ define("ember-handlebars/tests/helpers/debug_test.jshint",
     });
   });
 define("ember-handlebars/tests/helpers/each_test",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-metal/computed","ember-runtime/controllers/array_controller","ember-handlebars-compiler","ember-runtime/system/native_array","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__) {
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-metal/computed","ember-runtime/controllers/array_controller","ember-handlebars-compiler","ember-runtime/system/native_array","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__) {
     "use strict";
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
@@ -8533,17 +8535,18 @@ define("ember-handlebars/tests/helpers/each_test",
     var EmberObject = __dependency2__["default"];
     var run = __dependency3__["default"];
     var EmberView = __dependency4__["default"];
-    var computed = __dependency5__.computed;
-    var ArrayController = __dependency6__["default"];
-    var EmberHandlebars = __dependency7__["default"];
+    var _MetamorphView = __dependency5__["default"];
+    var computed = __dependency6__.computed;
+    var ArrayController = __dependency7__["default"];
+    var EmberHandlebars = __dependency8__["default"];
     // import {expectAssertion} from "ember-metal/tests/debug_helpers";
-    var A = __dependency8__.A;
-    var EmberController = __dependency9__.default;
-    var ObjectController = __dependency10__["default"];
-    var Container = __dependency11__["default"];
+    var A = __dependency9__.A;
+    var EmberController = __dependency10__["default"];
+    var ObjectController = __dependency11__["default"];
+    var Container = __dependency12__["default"];
 
-    var get = __dependency12__.get;
-    var set = __dependency13__.set;
+    var get = __dependency13__.get;
+    var set = __dependency14__.set;
 
     var people, view, container;
     var template, templateMyView;
@@ -8562,7 +8565,8 @@ define("ember-handlebars/tests/helpers/each_test",
         people = A([{ name: "Steve Holt" }, { name: "Annabelle" }]);
 
         container = new Container();
-        container.register('view:default', EmberView.extend());
+        container.register('view:default', _MetamorphView);
+        container.register('view:toplevel', EmberView.extend());
 
         view = EmberView.create({
           container: container,
@@ -9055,7 +9059,8 @@ define("ember-handlebars/tests/helpers/each_test",
     QUnit.module("{{#each foo in bar}}", {
       setup: function() {
         container = new Container();
-        container.register('view:default', EmberView.extend());
+        container.register('view:default', _MetamorphView);
+        container.register('view:toplevel', EmberView.extend());
       },
       teardown: function() {
         run(function() {
@@ -9289,21 +9294,22 @@ define("ember-handlebars/tests/helpers/each_test.jshint",
     });
   });
 define("ember-handlebars/tests/helpers/group_test",
-  ["ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-handlebars-compiler","ember-runtime/system/array_proxy","ember-runtime/system/native_array","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set","ember-views/views/component"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__) {
+  ["ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-handlebars-compiler","ember-runtime/system/array_proxy","ember-runtime/system/native_array","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set","ember-views/views/component"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__) {
     "use strict";
     /*jshint newcap:false*/
 
     var run = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
     var EmberView = __dependency3__["default"];
-    var EmberHandlebars = __dependency4__["default"];
-    var ArrayProxy = __dependency5__["default"];
-    var A = __dependency6__.A;
-    var Container = __dependency7__["default"];
-    var get = __dependency8__.get;
-    var set = __dependency9__.set;
-    var Component = __dependency10__["default"];
+    var _MetamorphView = __dependency4__["default"];
+    var EmberHandlebars = __dependency5__["default"];
+    var ArrayProxy = __dependency6__["default"];
+    var A = __dependency7__.A;
+    var Container = __dependency8__["default"];
+    var get = __dependency9__.get;
+    var set = __dependency10__.set;
+    var Component = __dependency11__["default"];
 
     var trim = jQuery.trim;
     var container, view;
@@ -9315,7 +9321,8 @@ define("ember-handlebars/tests/helpers/group_test",
     QUnit.module("EmberHandlebars - group flag", {
       setup: function() {
         container = new Container();
-        container.register('view:default', EmberView.extend());
+        container.register('view:default', _MetamorphView);
+        container.register('view:toplevel', EmberView.extend());
       },
 
       teardown: function() {
@@ -10377,13 +10384,14 @@ define("ember-handlebars/tests/helpers/unbound_test.jshint",
     });
   });
 define("ember-handlebars/tests/helpers/view_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-views/system/jquery"],
-  function(__dependency1__, __dependency2__, __dependency3__) {
+  ["ember-views/views/view","container/container","ember-metal/run_loop","ember-views/system/jquery"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     /*globals EmberDev */
     var EmberView = __dependency1__["default"];
-    var run = __dependency2__["default"];
-    var jQuery = __dependency3__["default"];
+    var Container = __dependency2__["default"];
+    var run = __dependency3__["default"];
+    var jQuery = __dependency4__["default"];
 
     var view, originalLookup;
 
@@ -10410,9 +10418,9 @@ define("ember-handlebars/tests/helpers/view_test",
       }
     });
 
-    test("By default view:default is used", function() {
+    test("By default view:toplevel is used", function() {
       var DefaultView = viewClass({
-        elementId: 'default-view',
+        elementId: 'toplevel-view',
         template: Ember.Handlebars.compile('hello world')
       });
 
@@ -10427,10 +10435,10 @@ define("ember-handlebars/tests/helpers/view_test",
 
       run(view, 'appendTo', '#qunit-fixture');
 
-      equal(jQuery('#default-view').text(), 'hello world');
+      equal(jQuery('#toplevel-view').text(), 'hello world');
 
       function lookupFactory(fullName) {
-        equal(fullName, 'view:default');
+        equal(fullName, 'view:toplevel');
 
         return DefaultView;
       }
@@ -10565,6 +10573,25 @@ define("ember-handlebars/tests/helpers/view_test",
 
       Ember.warn = oldWarn;
     });
+
+    test("allows you to pass attributes that will be assigned to the class instance, like class=\"foo\"", function() {
+      expect(4);
+
+      var container = new Container();
+      container.register('view:toplevel', EmberView.extend());
+
+      view = EmberView.extend({
+        template: Ember.Handlebars.compile('{{view id="foo" tagName="h1" class="foo"}}{{#view id="bar" class="bar"}}Bar{{/view}}'),
+        container: container
+      }).create();
+
+      run(view, 'appendTo', '#qunit-fixture');
+
+      ok(jQuery('#foo').hasClass('foo'));
+      ok(jQuery('#foo').is('h1'));
+      ok(jQuery('#bar').hasClass('bar'));
+      equal(jQuery('#bar').text(), 'Bar');
+    });
   });
 define("ember-handlebars/tests/helpers/view_test.jshint",
   [],
@@ -11028,6 +11055,33 @@ define("ember-handlebars/tests/helpers/with_test",
 
       ok(destroyed, 'controller was destroyed properly');
     });
+
+    QUnit.module("{{#with}} helper binding to view keyword", {
+      setup: function() {
+        Ember.lookup = lookup = { Ember: Ember };
+
+        view = EmberView.create({
+          template: EmberHandlebars.compile("We have: {{#with view.thing as fromView}}{{fromView.name}} and {{fromContext.name}}{{/with}}"),
+          thing: { name: 'this is from the view' },
+          context: {
+            fromContext: { name: "this is from the context" },
+          }
+        });
+
+        appendView(view);
+      },
+
+      teardown: function() {
+        run(function() {
+          view.destroy();
+        });
+        Ember.lookup = originalLookup;
+      }
+    });
+
+    test("{{with}} helper can bind to keywords with 'as'", function(){
+      equal(view.$().text(), "We have: this is from the view and this is from the context", "should render");
+    });
   });
 define("ember-handlebars/tests/helpers/with_test.jshint",
   [],
@@ -12662,6 +12716,15 @@ define("ember-metal.jshint",
       ok(true, 'ember-metal.js should pass jshint.'); 
     });
   });
+define("ember-metal/alias.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-metal');
+    test('ember-metal/alias.js should pass jshint', function() { 
+      ok(true, 'ember-metal/alias.js should pass jshint.'); 
+    });
+  });
 define("ember-metal/array.jshint",
   [],
   function() {
@@ -12698,6 +12761,15 @@ define("ember-metal/computed.jshint",
       ok(true, 'ember-metal/computed.js should pass jshint.'); 
     });
   });
+define("ember-metal/computed_macros.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-metal');
+    test('ember-metal/computed_macros.js should pass jshint', function() { 
+      ok(true, 'ember-metal/computed_macros.js should pass jshint.'); 
+    });
+  });
 define("ember-metal/core.jshint",
   [],
   function() {
@@ -12707,6 +12779,15 @@ define("ember-metal/core.jshint",
       ok(true, 'ember-metal/core.js should pass jshint.'); 
     });
   });
+define("ember-metal/dependent_keys.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-metal');
+    test('ember-metal/dependent_keys.js should pass jshint', function() { 
+      ok(true, 'ember-metal/dependent_keys.js should pass jshint.'); 
+    });
+  });
 define("ember-metal/enumerable_utils.jshint",
   [],
   function() {
@@ -13560,6 +13641,83 @@ define("ember-metal/tests/accessors/set_test.jshint",
       ok(true, 'ember-metal/tests/accessors/set_test.js should pass jshint.'); 
     });
   });
+define("ember-metal/tests/alias_test",
+  ["ember-metal/alias","ember-metal/properties","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/watching","ember-metal/observer","ember-metal/mixin"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
+    "use strict";
+    var alias = __dependency1__.alias;
+    var Descriptor = __dependency2__.Descriptor;
+    var defineProperty = __dependency2__.defineProperty;
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var meta = __dependency5__.meta;
+    var isWatching = __dependency6__.isWatching;
+    var addObserver = __dependency7__.addObserver;
+    var removeObserver = __dependency7__.removeObserver;
+    var mixin = __dependency8__.mixin;
+    var observer = __dependency8__.observer;
+
+    var obj, count;
+
+    QUnit.module('ember-metal/alias', {
+      setup: function() {
+        obj = { foo: { faz: 'FOO' } };
+        count = 0;
+      },
+      teardown: function() {
+        obj = null;
+      }
+    });
+
+    function incrementCount() {
+      count++;
+    }
+
+    test('should proxy get to alt key', function() {
+      defineProperty(obj, 'bar', alias('foo.faz'));
+      equal(get(obj, 'bar'), 'FOO');
+    });
+
+    test('should proxy set to alt key', function() {
+      defineProperty(obj, 'bar', alias('foo.faz'));
+      set(obj, 'bar', 'BAR');
+      equal(get(obj, 'foo.faz'), 'BAR');
+    });
+
+    test('basic lifecycle', function() {
+      defineProperty(obj, 'bar', alias('foo.faz'));
+      var m = meta(obj);
+      addObserver(obj, 'bar', incrementCount);
+      equal(m.deps['foo.faz'].bar, 1);
+      removeObserver(obj, 'bar', incrementCount);
+      equal(m.deps['foo.faz'].bar, 0);
+    });
+
+    test('begins watching alt key as soon as alias is watched', function() {
+      defineProperty(obj, 'bar', alias('foo.faz'));
+      addObserver(obj, 'bar', incrementCount);
+      ok(isWatching(obj, 'foo.faz'));
+      set(obj, 'foo.faz', 'BAR');
+      equal(count, 1);
+    });
+
+    test('immediately sets up dependencies if already being watched', function() {
+      addObserver(obj, 'bar', incrementCount);
+      defineProperty(obj, 'bar', alias('foo.faz'));
+      ok(isWatching(obj, 'foo.faz'));
+      set(obj, 'foo.faz', 'BAR');
+      equal(count, 1);
+    });
+  });
+define("ember-metal/tests/alias_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-metal/tests');
+    test('ember-metal/tests/alias_test.js should pass jshint', function() { 
+      ok(true, 'ember-metal/tests/alias_test.js should pass jshint.'); 
+    });
+  });
 define("ember-metal/tests/binding/connect_test",
   ["ember-metal/core","ember-metal/tests/props_helper","ember-metal/binding","ember-metal/run_loop","ember-metal/platform","ember-metal/property_set","ember-metal/property_get","ember-metal/watching"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
@@ -13806,7 +13964,7 @@ define("ember-metal/tests/binding/sync_test",
             getCalled++;
             return setValue;
           }
-        }).volatile());
+        })["volatile"]());
 
         b = {
           a: a
@@ -21081,7 +21239,7 @@ define("ember-routing-handlebars/tests/helpers/action_test",
 
     var Container = __dependency5__["default"];
     var EmberObject = __dependency6__["default"];
-    var EmberController = __dependency7__.default;
+    var EmberController = __dependency7__["default"];
     var EmberObjectController = __dependency8__["default"];
     var EmberArrayController = __dependency9__["default"];
 
@@ -21890,7 +22048,7 @@ define("ember-routing-handlebars/tests/helpers/action_test",
       });
 
       var event = jQuery.Event("keyup");
-      event.char = 'a';
+      event["char"] = 'a';
       event.which = 65;
       view.$('input').trigger(event);
       ok(showCalled, "should call action with keyup");
@@ -22301,7 +22459,7 @@ define("ember-routing-handlebars/tests/helpers/outlet_test",
 
         var namespace = Namespace.create();
         container = buildContainer(namespace);
-        container.register('view:default', EmberView.extend());
+        container.register('view:default', _MetamorphView);
         container.register('router:main', EmberRouter.extend());
       },
       teardown: function() {
@@ -22583,8 +22741,8 @@ define("ember-routing-handlebars/tests/helpers/outlet_test.jshint",
     });
   });
 define("ember-routing-handlebars/tests/helpers/render_test",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/platform","ember-metal/mixin","container/container","ember-runtime/system/namespace","ember-runtime/system/string","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-routing/system/router","ember-routing/location/hash_location","ember-handlebars","ember-routing/ext/view","ember-views/system/jquery","ember-routing-handlebars/helpers/render","ember-routing-handlebars/helpers/action","ember-routing-handlebars/helpers/outlet"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/platform","ember-metal/mixin","container/container","ember-runtime/system/namespace","ember-runtime/system/string","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-routing/system/router","ember-routing/location/hash_location","ember-handlebars","ember-routing/ext/view","ember-handlebars/views/metamorph_view","ember-views/system/jquery","ember-routing-handlebars/helpers/render","ember-routing-handlebars/helpers/action","ember-routing-handlebars/helpers/outlet"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // TEMPLATES
@@ -22599,7 +22757,7 @@ define("ember-routing-handlebars/tests/helpers/render_test",
     var classify = __dependency9__.classify;
     var decamelize = __dependency9__.decamelize;
 
-    var EmberController = __dependency10__.default;
+    var EmberController = __dependency10__["default"];
     var EmberObjectController = __dependency11__["default"];
     var EmberArrayController = __dependency12__["default"];
 
@@ -22608,12 +22766,13 @@ define("ember-routing-handlebars/tests/helpers/render_test",
 
     var EmberHandlebars = __dependency15__["default"];
     var EmberView = __dependency16__["default"];
-    var jQuery = __dependency17__["default"];
+    var _MetamorphView = __dependency17__["default"];
+    var jQuery = __dependency18__["default"];
 
-    var renderHelper = __dependency18__["default"];
-    var ActionHelper = __dependency19__.ActionHelper;
-    var actionHelper = __dependency19__.actionHelper;
-    var outletHelper = __dependency20__.outletHelper;
+    var renderHelper = __dependency19__["default"];
+    var ActionHelper = __dependency20__.ActionHelper;
+    var actionHelper = __dependency20__.actionHelper;
+    var outletHelper = __dependency21__.outletHelper;
 
     function appendView(view) {
       run(function() { view.appendTo('#qunit-fixture'); });
@@ -22683,7 +22842,7 @@ define("ember-routing-handlebars/tests/helpers/render_test",
 
         var namespace = Namespace.create();
         container = buildContainer(namespace);
-        container.register('view:default', EmberView.extend());
+        container.register('view:default', _MetamorphView);
         container.register('router:main', EmberRouter.extend());
       },
       teardown: function() {
@@ -23890,6 +24049,7 @@ define("ember-routing/tests/system/controller_for_test",
     var ObjectController = __dependency9__["default"];
     var ArrayController = __dependency10__["default"];
     var controllerFor = __dependency11__["default"];
+    var generateControllerFactory = __dependency12__.generateControllerFactory;
     var generateController = __dependency12__["default"];
 
     var buildContainer = function(namespace) {
@@ -23961,6 +24121,11 @@ define("ember-routing/tests/system/controller_for_test",
       }
     });
 
+    test("generateController and generateControllerFactory are properties on the root namespace", function() {
+      equal(Ember.generateController, generateController, 'should export generateController');
+      equal(Ember.generateControllerFactory, generateControllerFactory, 'should export generateControllerFactory');
+    });
+
     test("generateController should create Ember.Controller", function() {
       var controller = generateController(container, 'home');
 
@@ -24315,6 +24480,12 @@ define("ember-routing/tests/system/router_test",
       }
     });
 
+    test("can create a router without a container", function() {
+      var router = Router.create();
+
+      ok(router.router);
+    });
+
     test("should create a router if one does not exist on the constructor", function() {
       createRouter();
 
@@ -27988,15 +28159,15 @@ define("ember-runtime/tests/controllers/item_controller_class_test.jshint",
       ok(true, 'ember-runtime/tests/controllers/item_controller_class_test.js should pass jshint.'); 
     });
   });
-define("ember-runtime/tests/controllers/object_controller_tests",
-  ["ember-runtime/controllers/object_controller"],
-  function(__dependency1__) {
+define("ember-runtime/tests/controllers/object_controller_test",
+  ["ember-runtime/controllers/object_controller","ember-metal/mixin"],
+  function(__dependency1__, __dependency2__) {
     "use strict";
     var ObjectController = __dependency1__["default"];
+    var observer = __dependency2__.observer;
 
     QUnit.module("Ember.ObjectController");
 
-
     test("should be able to set the target property of an ObjectController", function() {
       var controller = ObjectController.create();
       var target = {};
@@ -28004,14 +28175,23 @@ define("ember-runtime/tests/controllers/object_controller_tests",
       controller.set('target', target);
       equal(controller.get('target'), target, "able to set the target property");
     });
+
+    // See https://github.com/emberjs/ember.js/issues/5112
+    test("can observe a path on an ObjectController", function() {
+      var controller = ObjectController.extend({
+        baz: observer('foo.bar', function() {})
+      }).create();
+      controller.set('model', {});
+      ok(true, "should not fail");
+    });
   });
-define("ember-runtime/tests/controllers/object_controller_tests.jshint",
+define("ember-runtime/tests/controllers/object_controller_test.jshint",
   [],
   function() {
     "use strict";
     module('JSHint - ember-runtime/tests/controllers');
-    test('ember-runtime/tests/controllers/object_controller_tests.js should pass jshint', function() { 
-      ok(true, 'ember-runtime/tests/controllers/object_controller_tests.js should pass jshint.'); 
+    test('ember-runtime/tests/controllers/object_controller_test.js should pass jshint', function() { 
+      ok(true, 'ember-runtime/tests/controllers/object_controller_test.js should pass jshint.'); 
     });
   });
 define("ember-runtime/tests/core/compare_test",
@@ -28728,7 +28908,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
           numberVal: 24,
           toggleVal: true,
 
-          computed: computed(function() { return 'value'; }).volatile(),
+          computed: computed(function() { return 'value'; })["volatile"](),
 
           method: function() { return "value"; },
 
@@ -28777,7 +28957,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
           numberVal: 24,
           toggleVal: true,
 
-          computed: computed(function() { return 'value'; }).volatile(),
+          computed: computed(function() { return 'value'; })["volatile"](),
 
           method: function() { return "value"; },
 
@@ -28860,7 +29040,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
     test("should return a property at a given path relative to the lookup", function() {
       lookup.Foo = ObservableObject.create({
         Bar: ObservableObject.createWithMixins({
-          Baz: computed(function() { return "blargh"; }).volatile()
+          Baz: computed(function() { return "blargh"; })["volatile"]()
         })
       });
 
@@ -28870,7 +29050,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
     test("should return a property at a given path relative to the passed object", function() {
       var foo = ObservableObject.create({
         bar: ObservableObject.createWithMixins({
-          baz: computed(function() { return "blargh"; }).volatile()
+          baz: computed(function() { return "blargh"; })["volatile"]()
         })
       });
 
@@ -28916,7 +29096,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
               this._computed = value ;
             }
             return this._computed ;
-          }).volatile(),
+          })["volatile"](),
 
           // method, but not a property
           _method: "method",
@@ -28998,7 +29178,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
           computed: computed(function(key, value) {
             this.computedCalls.push(value);
             return 'computed';
-          }).volatile(),
+          })["volatile"](),
 
           computedCachedCalls: [],
           computedCached: computed(function(key, value) {
@@ -29015,13 +29195,13 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
           dependent: computed(function(key, value) {
             this.dependentCalls.push(value);
             return 'dependent';
-          }).property('changer').volatile(),
+          }).property('changer')["volatile"](),
 
           dependentFrontCalls: [],
           dependentFront: computed('changer', function(key, value) {
             this.dependentFrontCalls.push(value);
             return 'dependentFront';
-          }).volatile(),
+          })["volatile"](),
 
           dependentCachedCalls: [],
           dependentCached: computed(function(key, value) {
@@ -29047,12 +29227,12 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/observable_test",
           isOn: computed(function(key, value) {
             if (value !== undefined) this.set('state', 'on');
             return this.get('state') === 'on';
-          }).property('state').volatile(),
+          }).property('state')["volatile"](),
 
           isOff: computed(function(key, value) {
             if (value !== undefined) this.set('state', 'off');
             return this.get('state') === 'off';
-          }).property('state').volatile()
+          }).property('state')["volatile"]()
 
         }) ;
       },
@@ -29826,7 +30006,7 @@ define("ember-runtime/tests/legacy_1x/mixins/observable/propertyChanges_test",
             return this;
           }
           return this._b;
-        }).volatile()
+        })["volatile"]()
       });
 
       a.set('b', 'foo');
@@ -38553,7 +38733,7 @@ define("ember-runtime/tests/system/object/computed_test",
 
       var ClassWithNoMetadata = EmberObject.extend({
         computedProperty: computed(function() {
-        }).volatile(),
+        })["volatile"](),
 
         staticProperty: 12
       });
@@ -42289,10 +42469,10 @@ define("ember-testing/tests/helpers_test",
 
       App.injectTestHelpers(helpers);
 
-      ok(helpers['visit'] !== 'snazzleflabber', "helper added to container");
+      ok(helpers.visit !== 'snazzleflabber', "helper added to container");
       App.removeTestHelpers();
 
-      ok(helpers['visit'] === 'snazzleflabber', "original value added back to container");
+      ok(helpers.visit === 'snazzleflabber', "original value added back to container");
     });
 
     test("`wait` respects registerWaiters", function() {
@@ -42482,7 +42662,42 @@ define("ember-testing/tests/helpers_test",
       equal(Test.pendingAjaxRequests, 0, 'pendingAjaxRequests is reset');
     });
 
-    test("`trigger` can be used to trigger arbitrary events", function() {
+    test("`triggerEvent can limit searching for a selector to a scope", function(){
+      expect(2);
+
+      var triggerEvent, wait, event;
+
+      run(function() {
+        App = EmberApplication.create();
+        App.setupForTesting();
+      });
+
+      App.IndexView = EmberView.extend({
+        template: Ember.Handlebars.compile('{{input type="text" id="outside-scope" class="input"}}<div id="limited">{{input type="text" id="inside-scope" class="input"}}</div>'),
+
+        didInsertElement: function() {
+          this.$('.input').on('blur change', function(e) {
+            event = e;
+          });
+        }
+      });
+
+      App.injectTestHelpers();
+
+      run(App, App.advanceReadiness);
+
+      triggerEvent = App.testHelpers.triggerEvent;
+      wait         = App.testHelpers.wait;
+
+      wait().then(function() {
+        return triggerEvent('.input', '#limited', 'blur');
+      }).then(function() {
+        equal(event.type, 'blur', 'correct event was triggered');
+        equal(event.target.getAttribute('id'), 'inside-scope', 'triggered on the correct element');
+      });
+    });
+
+    test("`triggerEvent` can be used to trigger arbitrary events", function() {
       expect(2);
 
       var triggerEvent, wait, event;
@@ -42602,6 +42817,61 @@ define("ember-testing/tests/helpers_test",
         equal(App.__container__.lookup('route:user').get('controller.model.firstName'), 'Tom', "should equal 'Tom'.");
       });
     });
+
+    var originalVisitHelper, originalFindHelper, originalWaitHelper;
+
+    QUnit.module('can override built-in helpers', {
+      setup: function(){
+        originalVisitHelper = Test._helpers.visit;
+        originalFindHelper  = Test._helpers.find;
+        originalWaitHelper  = Test._helpers.wait;
+
+        jQuery('<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>').appendTo('head');
+        jQuery('<div id="ember-testing-container"><div id="ember-testing"></div></div>').appendTo('body');
+        run(function() {
+          App = Ember.Application.create({
+            rootElement: '#ember-testing'
+          });
+
+          App.setupForTesting();
+        });
+      },
+
+      teardown: function(){
+        App.removeTestHelpers();
+        jQuery('#ember-testing-container, #ember-testing').remove();
+        run(App, App.destroy);
+        App = null;
+
+        Test._helpers.visit = originalVisitHelper;
+        Test._helpers.find  = originalFindHelper;
+        Test._helpers.wait  = originalWaitHelper;
+      }
+    });
+
+    test("can override visit helper", function(){
+      expect(1);
+
+      Test.registerHelper('visit', function(){
+        ok(true, 'custom visit helper was called');
+      });
+
+      App.injectTestHelpers();
+      App.testHelpers.visit();
+    });
+
+    test("can override find helper", function(){
+      expect(1);
+
+      Test.registerHelper('find', function(){
+        ok(true, 'custom find helper was called');
+
+        return ['not empty array'];
+      });
+
+      App.injectTestHelpers();
+      App.testHelpers.findWithAssert('.who-cares');
+    });
   });
 define("ember-testing/tests/helpers_test.jshint",
   [],
@@ -47252,7 +47522,7 @@ define("ember-views/tests/views/view/init_test",
           elementId: 'test',
           classNames: computed(function() {
             return ['className'];
-          }).volatile()
+          })["volatile"]()
         });
       }, /Only arrays are allowed/i);
     });
@@ -47263,7 +47533,7 @@ define("ember-views/tests/views/view/init_test",
           elementId: 'test',
           classNameBindings: computed(function() {
             return ['className'];
-          }).volatile()
+          })["volatile"]()
         });
       }, /Only arrays are allowed/i);
     });
@@ -49758,6 +50028,31 @@ define("ember/tests/component_registration_test.jshint",
       ok(true, 'ember/tests/component_registration_test.js should pass jshint.'); 
     });
   });
+define("ember/tests/global-api-test",
+  ["ember"],
+  function(__dependency1__) {
+    "use strict";
+
+    QUnit.module("Global API Tests");
+
+    function confirmExport(property) {
+      test('confirm ' + property + ' is exported', function() {
+        ok(Ember.get(window, property) + ' is exported propertly');
+      });
+    }
+
+    confirmExport('Ember.DefaultResolver');
+    confirmExport('Ember.generateController');
+  });
+define("ember/tests/global-api-test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember/tests');
+    test('ember/tests/global-api-test.js should pass jshint', function() { 
+      ok(true, 'ember/tests/global-api-test.js should pass jshint.'); 
+    });
+  });
 define("ember/tests/helpers/helper_registration_test",
   ["ember"],
   function(__dependency1__) {
@@ -51690,7 +51985,7 @@ define("ember/tests/routing/basic_test",
     var get = __dependency3__.get;
     var set = __dependency4__.set;
 
-    var Router, App, AppView, templates, router, container;
+    var Router, App, AppView, templates, router, container, originalLoggerError;
     var compile = Ember.Handlebars.compile;
 
     function bootApplication() {
@@ -51755,6 +52050,8 @@ define("ember/tests/routing/basic_test",
           Ember.TEMPLATES.home = compile("<h3>Hours</h3>");
           Ember.TEMPLATES.homepage = compile("<h3>Megatroll</h3><p>{{home}}</p>");
           Ember.TEMPLATES.camelot = compile('<section><h3>Is a silly place</h3></section>');
+
+          originalLoggerError = Ember.Logger.error;
         });
       },
 
@@ -51764,6 +52061,7 @@ define("ember/tests/routing/basic_test",
           App = null;
 
           Ember.TEMPLATES = {};
+          Ember.Logger.error = originalLoggerError;
         });
       }
     });
@@ -51905,6 +52203,31 @@ define("ember/tests/routing/basic_test",
       equal(Ember.$('h3:contains(Megatroll) + p:contains(Comes from homepage)', '#qunit-fixture').length, 1, "The homepage template was rendered");
     });
 
+    test("An alternate template will pull in an alternate controller instead of controllerName", function() {
+      Router.map(function() {
+        this.route("home", { path: "/" });
+      });
+
+      App.HomeRoute = Ember.Route.extend({
+        controllerName: 'foo',
+        renderTemplate: function() {
+          this.render('homepage');
+        }
+      });
+
+      App.FooController = Ember.Controller.extend({
+        home: "Comes from Foo"
+      });
+
+      App.HomepageController = Ember.Controller.extend({
+        home: "Comes from homepage"
+      });
+
+      bootApplication();
+
+      equal(Ember.$('h3:contains(Megatroll) + p:contains(Comes from homepage)', '#qunit-fixture').length, 1, "The homepage template was rendered");
+    });
+
     test("The template will pull in an alternate controller via key/value", function() {
       Router.map(function() {
         this.route("homepage", { path: "/" });
@@ -52238,6 +52561,33 @@ define("ember/tests/routing/basic_test",
       equal(Ember.$('p', '#qunit-fixture').text(), "alternative home: foo", "The homepage template was rendered with data from the custom controller");
     });
 
+    test("The route controller specified via controllerName is used in render even when a controller with the routeName is available", function() {
+      Router.map(function() {
+        this.route("home", { path: "/" });
+      });
+
+      Ember.TEMPLATES.home = Ember.Handlebars.compile(
+        "<p>home: {{myValue}}</p>"
+      );
+
+      App.HomeRoute = Ember.Route.extend({
+        controllerName: 'myController'
+      });
+
+      container.register('controller:home', Ember.Controller.extend({
+        myValue: "home"
+      }));
+
+      container.register('controller:myController', Ember.Controller.extend({
+        myValue: "myController"
+      }));
+
+      bootApplication();
+
+      deepEqual(container.lookup('route:home').controller, container.lookup('controller:myController'), "route controller is set by controllerName");
+      equal(Ember.$('p', '#qunit-fixture').text(), "home: myController", "The homepage template was rendered with data from the custom controller");
+    });
+
     test("The Homepage with a `setupController` hook modifying other controllers", function() {
       Router.map(function() {
         this.route("home", { path: "/" });
@@ -54712,8 +55062,7 @@ define("ember/tests/routing/basic_test",
 
     test("rejecting the model hooks promise with a non-error prints the `message` property", function() {
       var rejectedMessage = 'OMG!! SOOOOOO BAD!!!!',
-          rejectedStack   = 'Yeah, buddy: stack gets printed too.',
-          originalLoggerError = Ember.Logger.error;
+          rejectedStack   = 'Yeah, buddy: stack gets printed too.';
 
       Router.map(function() {
         this.route("yippie", { path: "/" });
@@ -54732,13 +55081,9 @@ define("ember/tests/routing/basic_test",
       });
 
       bootApplication();
-
-      Ember.Logger.error = originalLoggerError;
     });
 
     test("rejecting the model hooks promise with no reason still logs error", function() {
-      var originalLoggerError = Ember.Logger.error;
-
       Router.map(function() {
         this.route("wowzers", { path: "/" });
       });
@@ -54754,8 +55099,6 @@ define("ember/tests/routing/basic_test",
       });
 
       bootApplication();
-
-      Ember.Logger.error = originalLoggerError;
     });
 
     test("rejecting the model hooks promise with a string shows a good error", function() {
@@ -54837,6 +55180,9 @@ define("ember/tests/routing/basic_test",
     
 
     test("Errors in transitionTo within redirect hook are logged", function() {
+      expect(2);
+      var actual = [];
+
       Router.map(function() {
         this.route('yondo', { path: "/" });
         this.route('stink-bomb');
@@ -54848,12 +55194,34 @@ define("ember/tests/routing/basic_test",
         }
       });
 
-      raises(function() {
-        bootApplication();
-      },
-      /More context objects were passed than there are dynamic segments for the route: stink-bomb/);
+      Ember.Logger.error = function(message) {
+        actual.push(message);
+      };
+
+      bootApplication();
+
+      equal(actual[0], 'Error while processing route: yondo', 'source route is printed');
+      ok(actual[1].match(/More context objects were passed than there are dynamic segments for the route: stink-bomb/), 'the error is printed');
     });
 
+    test("Errors in transition show error template if available", function() {
+      Ember.TEMPLATES.error = compile("<div id='error'>Error!</div>");
+
+      Router.map(function() {
+        this.route('yondo', { path: "/" });
+        this.route('stink-bomb');
+      });
+
+      App.YondoRoute = Ember.Route.extend({
+        redirect: function(){
+          this.transitionTo('stink-bomb', {something: 'goes boom'});
+        }
+      });
+
+      bootApplication();
+
+      equal(Ember.$('#error').length, 1, "Error template was rendered.");
+    });
 
     
       test("Route#resetController gets fired when changing models and exiting routes", function() {
@@ -54910,17 +55278,30 @@ define("ember/tests/routing/basic_test.jshint",
     });
   });
 define("ember/tests/routing/query_params_test",
-  ["ember","ember-metal/enumerable_utils"],
-  function(__dependency1__, __dependency2__) {
+  ["ember","ember-metal/enumerable_utils","ember-metal/platform"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     var forEach = __dependency2__.forEach;
     var map = __dependency2__.map;
+    var platform = __dependency3__.platform;
 
     var Router, App, AppView, templates, router, container;
     var get = Ember.get;
     var set = Ember.set;
     var compile = Ember.Handlebars.compile;
 
+    function withoutMeta(object) {
+      if (platform.defineProperty.isSimulated) {
+        var newObject = Ember.$.extend(true, {}, object);
+
+        delete newObject['__ember_meta__'];
+
+        return newObject;
+      } else {
+        return object;
+      }
+    }
+
     function bootApplication() {
       router = container.lookup('router:main');
       Ember.run(App, 'advanceReadiness');
@@ -55949,7 +56330,7 @@ define("ember/tests/routing/query_params_test",
 
         App.IndexRoute = Ember.Route.extend({
           setupController: function(controller, model) {
-            deepEqual(model, { woot: true }, "index route inherited model route from parent route");
+            deepEqual(withoutMeta(model), { woot: true }, "index route inherited model route from parent route");
           }
         });
 
@@ -56108,7 +56489,7 @@ define("ember/tests/routing/query_params_test",
 
         equal(this.controller.get('q'), 'wat');
         equal(this.controller.get('z'), 0);
-        deepEqual(this.controller.get('model'), { id: 'a-2' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-2' });
         equal(this.$link1.attr('href'), '/a/a-1?q=lol');
         equal(this.$link2.attr('href'), '/a/a-2');
         equal(this.$link3.attr('href'), '/a/a-3');
@@ -56121,7 +56502,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-1', q: 'lol', z: 0 };
         handleURL('/a/a-1?q=lol');
 
-        deepEqual(this.controller.get('model'), { id: 'a-1' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-1' });
         equal(this.controller.get('q'), 'lol');
         equal(this.controller.get('z'), 0);
         equal(this.$link1.attr('href'), '/a/a-1?q=lol');
@@ -56131,7 +56512,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-2', q: 'lol', z: 0 };
         handleURL('/a/a-2?q=lol');
 
-        deepEqual(this.controller.get('model'), { id: 'a-2' }, "controller's model changed to a-2");
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-2' }, "controller's model changed to a-2");
         equal(this.controller.get('q'), 'lol');
         equal(this.controller.get('z'), 0);
         equal(this.$link1.attr('href'), '/a/a-1?q=lol');
@@ -56157,7 +56538,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-1', q: 'wat', z: 0 };
         Ember.run(router, 'transitionTo', 'article', 'a-1');
 
-        deepEqual(this.controller.get('model'), { id: 'a-1' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-1' });
         equal(this.controller.get('q'), 'wat');
         equal(this.controller.get('z'), 0);
         equal(this.$link1.attr('href'), '/a/a-1');
@@ -56167,7 +56548,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-2', q: 'lol', z: 0 };
         Ember.run(router, 'transitionTo', 'article', 'a-2', { queryParams: { q: 'lol' } });
 
-        deepEqual(this.controller.get('model'), { id: 'a-2' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-2' });
         equal(this.controller.get('q'), 'lol');
         equal(this.controller.get('z'), 0);
         equal(this.$link1.attr('href'), '/a/a-1');
@@ -56177,7 +56558,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-3', q: 'hay', z: 0 };
         Ember.run(router, 'transitionTo', 'article', 'a-3', { queryParams: { q: 'hay' } });
 
-        deepEqual(this.controller.get('model'), { id: 'a-3' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-3' });
         equal(this.controller.get('q'), 'hay');
         equal(this.controller.get('z'), 0);
         equal(this.$link1.attr('href'), '/a/a-1');
@@ -56187,7 +56568,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-2', q: 'lol', z: 1 };
         Ember.run(router, 'transitionTo', 'article', 'a-2', { queryParams: { z: 1 } });
 
-        deepEqual(this.controller.get('model'), { id: 'a-2' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-2' });
         equal(this.controller.get('q'), 'lol');
         equal(this.controller.get('z'), 1);
         equal(this.$link1.attr('href'), '/a/a-1');
@@ -56215,7 +56596,7 @@ define("ember/tests/routing/query_params_test",
 
         equal(this.controller.get('q'), 'lol');
         equal(this.controller.get('z'), 0);
-        deepEqual(this.controller.get('model'), { id: 'a-2' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-2' });
 
         equal(this.$link1.attr('href'), '/a/a-1?q=lol');
         equal(this.$link2.attr('href'), '/a/a-2?q=lol');
@@ -56224,7 +56605,7 @@ define("ember/tests/routing/query_params_test",
         this.expectedModelHookParams = { id: 'a-3', q: 'haha', z: 123 };
         handleURL('/a/a-3?q=haha&z=123');
 
-        deepEqual(this.controller.get('model'), { id: 'a-3' });
+        deepEqual(withoutMeta(this.controller.get('model')), { id: 'a-3' });
         equal(this.controller.get('q'), 'haha');
         equal(this.controller.get('z'), 123);