Merge pull request #11603 from nathanhammond/nathanhammond-fix-extend

[BUGFIX] Add return statement for extend.
emberjs · Jun 30, 2015 · 0472f7a · 0472f7a
2 parents 777a00d + 474fbf7
commit 0472f7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js b/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js
@@ -132,6 +132,15 @@ QUnit.test("reopening on LinkView actually reopens on LinkComponent", function()
 
 });
 
+QUnit.test("Extending a LinkView returns a LinkView.", function() {
+  expect(2);
+
+  expectDeprecation(function() {
+    var result = Ember.LinkView.extend({});
+    equal(result.toString(), '(subclass of Ember.LinkView)', 'Returns a subclass of the Ember.LinkView object.');
+  });
+});
+
 QUnit.test("unwraps controllers", function() {
   var template = "{{#link-to 'index' view.otherController}}Text{{/link-to}}";
 

diff --git a/packages/ember-routing-views/lib/views/link.js b/packages/ember-routing-views/lib/views/link.js
@@ -522,7 +522,7 @@ DeprecatedLinkView.reopen = function reopenWithDeprecation() {
 DeprecatedLinkView.reopenClass({
   extend: function () {
     Ember.deprecate('Ember.LinkView is deprecated. Please extend from Ember.LinkComponent.', false);
-    this._super.apply(this, arguments);
+    return this._super.apply(this, arguments);
   }
 });