ember-source 1.11.0.beta.2.2 → 1.11.0.beta.3

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.2
+ * @version   1.11.0-beta.3.780ac356
  */
 
 (function() {
@@ -805,8 +805,8 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   Example:
 
   ```javascript
-  function validateRouteName(){
-  equal(currentRouteName(), 'some.path', "correct route was transitioned into.");
+  function validateRouteName() {
+    equal(currentRouteName(), 'some.path', "correct route was transitioned into.");
   }
 
   visit('/some/path').then(validateRouteName)
@@ -824,8 +824,8 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   Example:
 
   ```javascript
-  function validateURL(){
-  equal(currentPath(), 'some.path.index', "correct path was transitioned into.");
+  function validateURL() {
+    equal(currentPath(), 'some.path.index', "correct path was transitioned into.");
   }
 
   click('#some-link-id').then(validateURL);
@@ -843,8 +843,8 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   Example:
 
   ```javascript
-  function validateURL(){
-  equal(currentURL(), '/some/path', "correct URL was transitioned into.");
+  function validateURL() {
+    equal(currentURL(), '/some/path', "correct URL was transitioned into.");
   }
 
   click('#some-link-id').then(validateURL);

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.2
+ * @version   1.11.0-beta.3.780ac356
  */
 
 (function() {
@@ -11147,6 +11147,28 @@ enifed('ember-htmlbars/tests/helpers/input_test', ['ember-metal/run_loop', 'embe
     equal(view.$('input').attr('tabindex'), "3", "updates text field after tabindex changes");
   });
 
+  QUnit.test("cursor position is not lost when updating content", function() {
+    equal(view.$('input').val(), "hello", "precondition - renders text field with value");
+
+    var $input = view.$('input');
+    var input = $input[0];
+
+    // set the cursor position to 3 (no selection)
+    run['default'](function() {
+      input.value = 'derp';
+      input.selectionStart = 3;
+      input.selectionEnd = 3;
+    });
+
+    run['default'](null, property_set.set, controller, 'val', 'derp');
+
+    equal(view.$('input').val(), "derp", "updates text field after value changes");
+
+    equal(input.selectionStart, 3, 'cursor position was not lost');
+    equal(input.selectionEnd, 3, 'cursor position was not lost');
+  });
+
+
   QUnit.module("{{input type='text'}} - static values", {
     setup: function() {
       controller = {};
@@ -14481,6 +14503,34 @@ enifed('ember-htmlbars/tests/helpers/yield_test', ['ember-metal/run_loop', 'embe
 
   });
 
+  QUnit.test("simple bindings inside of a yielded template should work properly when the yield is nested inside of another view", function() {
+    view = EmberView['default'].create({
+      layout:   compile['default']('{{#if view.falsy}}{{else}}{{yield}}{{/if}}'),
+      template: compile['default']("{{view.text}}"),
+      text: "ohai"
+    });
+
+    run['default'](function() {
+      view.createElement();
+    });
+
+    equal(view.$().text(), "ohai");
+  });
+
+  QUnit.test("nested simple bindings inside of a yielded template should work properly when the yield is nested inside of another view", function() {
+    view = EmberView['default'].create({
+      layout:   compile['default']('{{#if view.falsy}}{{else}}{{yield}}{{/if}}'),
+      template: compile['default']("{{#if view.falsy}}{{else}}{{view.text}}{{/if}}"),
+      text: "ohai"
+    });
+
+    run['default'](function() {
+      view.createElement();
+    });
+
+    equal(view.$().text(), "ohai");
+  });
+
   QUnit.module("ember-htmlbars: Component {{yield}}", {
     setup: function() {},
     teardown: function() {
@@ -16063,6 +16113,133 @@ enifed('ember-htmlbars/tests/integration/with_view_test.jshint', function () {
     ok(true, 'ember-htmlbars/tests/integration/with_view_test.js should pass jshint.'); 
   });
 
+});
+enifed('ember-htmlbars/tests/system/append-templated-view-test', ['ember-runtime/tests/utils', 'ember-views/views/view', 'ember-views/views/component', 'ember-template-compiler/system/compile'], function (utils, EmberView, EmberComponent, compile) {
+
+  'use strict';
+
+  var view;
+  QUnit.module('ember-htmlbars: appendTemplatedView', {
+    teardown: function() {
+      utils.runDestroy(view);
+    }
+  });
+
+  QUnit.test('can accept a view instance', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberView['default'].create({
+        template: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - controller context');
+  });
+
+  QUnit.test('can accept a view factory', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberView['default'].extend({
+        template: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - controller context');
+  });
+
+  QUnit.test('does change the context if the view factory has a controller specified', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberView['default'].extend({
+        controller: {
+          someProp: 'view local controller context'
+        },
+        template: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - view local controller context');
+  });
+
+  QUnit.test('does change the context if a component factory is used', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberComponent['default'].extend({
+        someProp: 'view local controller context',
+        layout: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - view local controller context');
+  });
+
+  QUnit.test('does change the context if a component instanced is used', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberComponent['default'].create({
+        someProp: 'view local controller context',
+        layout: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - view local controller context');
+  });
+
+});
+enifed('ember-htmlbars/tests/system/append-templated-view-test.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-htmlbars/tests/system');
+  test('ember-htmlbars/tests/system/append-templated-view-test.js should pass jscs', function() {
+    ok(true, 'ember-htmlbars/tests/system/append-templated-view-test.js should pass jscs.');
+  });
+
+});
+enifed('ember-htmlbars/tests/system/append-templated-view-test.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-htmlbars/tests/system');
+  test('ember-htmlbars/tests/system/append-templated-view-test.js should pass jshint', function() { 
+    ok(true, 'ember-htmlbars/tests/system/append-templated-view-test.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-htmlbars/tests/system/bootstrap_test', ['ember-views/system/jquery', 'ember-metal/run_loop', 'ember-views/views/view', 'ember-runtime/tests/utils', 'ember-htmlbars/system/bootstrap'], function (jQuery, run, EmberView, utils, bootstrap) {
 
@@ -16738,7 +16915,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',
+        revision: 'Ember@1.11.0-beta.3.780ac356',
         render: function(view, env, contextualElement, blockArguments) {
           for (var i = 0, l = keyNames.length; i < l; i++) {
             var keyName = keyNames[i];
@@ -51962,7 +52139,7 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
 
     var actual = compile['default'](templateString);
 
-    equal(actual.revision, 'Ember@1.11.0-beta.2', 'revision is included in generated template');
+    equal(actual.revision, 'Ember@1.11.0-beta.3.780ac356', 'revision is included in generated template');
   });
 
   QUnit.test('the template revision is different than the HTMLBars default revision', function() {
@@ -70492,6 +70669,31 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
     bootApplication();
   });
 
+  QUnit.test("rejecting the model hooks promise with an error with `errorThrown` property prints `errorThrown.message` property", function() {
+    var rejectedMessage = 'OMG!! SOOOOOO BAD!!!!';
+    var rejectedStack   = 'Yeah, buddy: stack gets printed too.';
+
+    Router.map(function() {
+      this.route("yippie", { path: "/" });
+    });
+
+    Ember.Logger.error = function(initialMessage, errorMessage, errorStack) {
+      equal(initialMessage, 'Error while processing route: yippie', 'a message with the current route name is printed');
+      equal(errorMessage, rejectedMessage, "the rejected reason's message property is logged");
+      equal(errorStack, rejectedStack, "the rejected reason's stack property is logged");
+    };
+
+    App.YippieRoute = Ember.Route.extend({
+      model: function() {
+        return Ember.RSVP.reject({
+          errorThrown: { message: rejectedMessage, stack: rejectedStack }
+        });
+      }
+    });
+
+    bootApplication();
+  });
+
   QUnit.test("rejecting the model hooks promise with no reason still logs error", function() {
     Router.map(function() {
       this.route("wowzers", { path: "/" });

data/dist/ember-tests.prod.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.2
+ * @version   1.11.0-beta.3.780ac356
  */
 
 (function() {
@@ -13175,6 +13175,28 @@ enifed('ember-htmlbars/tests/helpers/input_test', ['ember-metal/run_loop', 'embe
     equal(view.$('input').attr('tabindex'), "3", "updates text field after tabindex changes");
   });
 
+  QUnit.test("cursor position is not lost when updating content", function() {
+    equal(view.$('input').val(), "hello", "precondition - renders text field with value");
+
+    var $input = view.$('input');
+    var input = $input[0];
+
+    // set the cursor position to 3 (no selection)
+    run['default'](function() {
+      input.value = 'derp';
+      input.selectionStart = 3;
+      input.selectionEnd = 3;
+    });
+
+    run['default'](null, property_set.set, controller, 'val', 'derp');
+
+    equal(view.$('input').val(), "derp", "updates text field after value changes");
+
+    equal(input.selectionStart, 3, 'cursor position was not lost');
+    equal(input.selectionEnd, 3, 'cursor position was not lost');
+  });
+
+
   QUnit.module("{{input type='text'}} - static values", {
     setup: function() {
       controller = {};
@@ -16509,6 +16531,34 @@ enifed('ember-htmlbars/tests/helpers/yield_test', ['ember-metal/run_loop', 'embe
 
   });
 
+  QUnit.test("simple bindings inside of a yielded template should work properly when the yield is nested inside of another view", function() {
+    view = EmberView['default'].create({
+      layout:   compile['default']('{{#if view.falsy}}{{else}}{{yield}}{{/if}}'),
+      template: compile['default']("{{view.text}}"),
+      text: "ohai"
+    });
+
+    run['default'](function() {
+      view.createElement();
+    });
+
+    equal(view.$().text(), "ohai");
+  });
+
+  QUnit.test("nested simple bindings inside of a yielded template should work properly when the yield is nested inside of another view", function() {
+    view = EmberView['default'].create({
+      layout:   compile['default']('{{#if view.falsy}}{{else}}{{yield}}{{/if}}'),
+      template: compile['default']("{{#if view.falsy}}{{else}}{{view.text}}{{/if}}"),
+      text: "ohai"
+    });
+
+    run['default'](function() {
+      view.createElement();
+    });
+
+    equal(view.$().text(), "ohai");
+  });
+
   QUnit.module("ember-htmlbars: Component {{yield}}", {
     setup: function() {},
     teardown: function() {
@@ -18091,6 +18141,133 @@ enifed('ember-htmlbars/tests/integration/with_view_test.jshint', function () {
     ok(true, 'ember-htmlbars/tests/integration/with_view_test.js should pass jshint.'); 
   });
 
+});
+enifed('ember-htmlbars/tests/system/append-templated-view-test', ['ember-runtime/tests/utils', 'ember-views/views/view', 'ember-views/views/component', 'ember-template-compiler/system/compile'], function (utils, EmberView, EmberComponent, compile) {
+
+  'use strict';
+
+  var view;
+  QUnit.module('ember-htmlbars: appendTemplatedView', {
+    teardown: function() {
+      utils.runDestroy(view);
+    }
+  });
+
+  QUnit.test('can accept a view instance', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberView['default'].create({
+        template: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - controller context');
+  });
+
+  QUnit.test('can accept a view factory', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberView['default'].extend({
+        template: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - controller context');
+  });
+
+  QUnit.test('does change the context if the view factory has a controller specified', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberView['default'].extend({
+        controller: {
+          someProp: 'view local controller context'
+        },
+        template: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - view local controller context');
+  });
+
+  QUnit.test('does change the context if a component factory is used', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberComponent['default'].extend({
+        someProp: 'view local controller context',
+        layout: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - view local controller context');
+  });
+
+  QUnit.test('does change the context if a component instanced is used', function() {
+    var controller = {
+      someProp: 'controller context',
+      someView: EmberComponent['default'].create({
+        someProp: 'view local controller context',
+        layout: compile['default']('{{someProp}}')
+      })
+    };
+
+    view = EmberView['default'].create({
+      controller: controller,
+      template: compile['default']('{{someProp}} - {{view someView}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'controller context - view local controller context');
+  });
+
+});
+enifed('ember-htmlbars/tests/system/append-templated-view-test.jscs-test', function () {
+
+  'use strict';
+
+  module('JSCS - ember-htmlbars/tests/system');
+  test('ember-htmlbars/tests/system/append-templated-view-test.js should pass jscs', function() {
+    ok(true, 'ember-htmlbars/tests/system/append-templated-view-test.js should pass jscs.');
+  });
+
+});
+enifed('ember-htmlbars/tests/system/append-templated-view-test.jshint', function () {
+
+  'use strict';
+
+  module('JSHint - ember-htmlbars/tests/system');
+  test('ember-htmlbars/tests/system/append-templated-view-test.js should pass jshint', function() { 
+    ok(true, 'ember-htmlbars/tests/system/append-templated-view-test.js should pass jshint.'); 
+  });
+
 });
 enifed('ember-htmlbars/tests/system/bootstrap_test', ['ember-views/system/jquery', 'ember-metal/run_loop', 'ember-views/views/view', 'ember-runtime/tests/utils', 'ember-htmlbars/system/bootstrap'], function (jQuery, run, EmberView, utils, bootstrap) {
 
@@ -18766,7 +18943,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',
+        revision: 'Ember@1.11.0-beta.3.780ac356',
         render: function(view, env, contextualElement, blockArguments) {
           for (var i = 0, l = keyNames.length; i < l; i++) {
             var keyName = keyNames[i];
@@ -53836,7 +54013,7 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
 
     var actual = compile['default'](templateString);
 
-    equal(actual.revision, 'Ember@1.11.0-beta.2', 'revision is included in generated template');
+    equal(actual.revision, 'Ember@1.11.0-beta.3.780ac356', 'revision is included in generated template');
   });
 
   QUnit.test('the template revision is different than the HTMLBars default revision', function() {
@@ -72349,6 +72526,31 @@ enifed('ember/tests/routing/basic_test', ['ember', 'ember-metal/enumerable_utils
     bootApplication();
   });
 
+  QUnit.test("rejecting the model hooks promise with an error with `errorThrown` property prints `errorThrown.message` property", function() {
+    var rejectedMessage = 'OMG!! SOOOOOO BAD!!!!';
+    var rejectedStack   = 'Yeah, buddy: stack gets printed too.';
+
+    Router.map(function() {
+      this.route("yippie", { path: "/" });
+    });
+
+    Ember.Logger.error = function(initialMessage, errorMessage, errorStack) {
+      equal(initialMessage, 'Error while processing route: yippie', 'a message with the current route name is printed');
+      equal(errorMessage, rejectedMessage, "the rejected reason's message property is logged");
+      equal(errorStack, rejectedStack, "the rejected reason's stack property is logged");
+    };
+
+    App.YippieRoute = Ember.Route.extend({
+      model: function() {
+        return Ember.RSVP.reject({
+          errorThrown: { message: rejectedMessage, stack: rejectedStack }
+        });
+      }
+    });
+
+    bootApplication();
+  });
+
   QUnit.test("rejecting the model hooks promise with no reason still logs error", function() {
     Router.map(function() {
       this.route("wowzers", { path: "/" });