Merge pull request #11389 from bantic/deprecate-view-helper

[BUGFIX beta] Add deprecation for view helper
emberjs · Jun 9, 2015 · c471c0f · c471c0f
2 parents 7cf3535 + c5be1b0
commit c471c0f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/packages/ember-debug/tests/main_test.js b/packages/ember-debug/tests/main_test.js
@@ -1,6 +1,29 @@
 import Ember from 'ember-metal/core';
 
-QUnit.module('ember-debug');
+let originalEnvValue;
+
+QUnit.module('ember-debug', {
+  setup() {
+    originalEnvValue = Ember.ENV.RAISE_ON_DEPRECATION;
+    Ember.ENV.RAISE_ON_DEPRECATION = true;
+  },
+
+  teardown() {
+    Ember.ENV.RAISE_ON_DEPRECATION = originalEnvValue;
+  }
+});
+
+QUnit.test('Ember.deprecate does not throw if RAISE_ON_DEPRECATION env value is false', function(assert) {
+  assert.expect(1);
+  Ember.ENV.RAISE_ON_DEPRECATION = false;
+
+  try {
+    Ember.deprecate('Should not throw', false);
+    assert.ok(true, 'Ember.deprecate did not throw');
+  } catch(e) {
+    assert.ok(false, `Expected Ember.deprecate not to throw but it did: ${e.message}`);
+  }
+});
 
 QUnit.test('Ember.deprecate throws deprecation if second argument is falsy', function() {
   expect(3);

diff --git a/packages/ember-htmlbars/lib/keywords/view.js b/packages/ember-htmlbars/lib/keywords/view.js
@@ -10,6 +10,7 @@ import objectKeys from "ember-metal/keys";
 
 export default {
   setupState(state, env, scope, params, hash) {
+    Ember.deprecate(`Using the "view" helper is deprecated.`, !!Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT, { url: 'http://emberjs.com/deprecations/v1.x/#toc_ember-view' });
     var read = env.hooks.getValue;
     var targetObject = read(scope.self);
     var viewClassOrInstance = state.viewClassOrInstance;

diff --git a/packages/ember-htmlbars/tests/helpers/view_test.js b/packages/ember-htmlbars/tests/helpers/view_test.js
@@ -143,6 +143,21 @@ QUnit.test("View lookup - App.FuView (DEPRECATED)", function() {
   equal(jQuery('#fu').text(), 'bro');
 });
 
+QUnit.test("View lookup in a template using 'view' helper is deprecated", function() {
+  var FuView = viewClass({});
+
+  registry.register('view:fu', FuView);
+
+  view = EmberView.extend({
+    template: compile("{{view 'fu'}}"),
+    container: container
+  }).create();
+
+  expectDeprecation(function() {
+    runAppend(view);
+  }, `Using the "view" helper is deprecated.`);
+});
+
 QUnit.test("View lookup - 'fu'", function() {
   var FuView = viewClass({
     elementId: "fu",

diff --git a/tests/index.html b/tests/index.html
@@ -68,7 +68,9 @@
         // Don't worry about jQuery version
         ENV['FORCE_JQUERY'] = true;
 
-        ENV['RAISE_ON_DEPRECATION'] = true;
+        // FIXME Many tests need to be ported to not use "{{view}}" before this
+        // can be re-enabled
+        ENV['RAISE_ON_DEPRECATION'] = false;
       })();
     </script>