diff --git a/packages/ember-views/lib/views/view.js b/packages/ember-views/lib/views/view.js index 417f37ae8a7..1b9e0ed7578 100644 --- a/packages/ember-views/lib/views/view.js +++ b/packages/ember-views/lib/views/view.js @@ -14,7 +14,6 @@ import { Mixin, observer } from "ember-metal/mixin"; -import { deprecateProperty } from "ember-metal/deprecate_property"; import jQuery from "ember-views/system/jquery"; import "ember-views/system/ext"; // for the side effect of extending Ember.run.queues @@ -1480,9 +1479,6 @@ var View = CoreView.extend( }); // jscs:enable validateIndentation -deprecateProperty(View.prototype, 'state', '_state'); -deprecateProperty(View.prototype, 'states', '_states'); - /* Describe how the specified actions should behave in the various states that a view can exist in. Possible states: diff --git a/packages/ember-views/tests/views/view/state_deprecation_test.js b/packages/ember-views/tests/views/view/state_deprecation_test.js deleted file mode 100644 index ee8cdf3199c..00000000000 --- a/packages/ember-views/tests/views/view/state_deprecation_test.js +++ /dev/null @@ -1,42 +0,0 @@ -import { hasPropertyAccessors } from "ember-metal/platform/define_property"; -import run from "ember-metal/run_loop"; -import EmberView from "ember-views/views/view"; - -var view; - -QUnit.module("views/view/state_deprecation", { - teardown() { - if (view) { - run(view, 'destroy'); - } - } -}); - -if (hasPropertyAccessors) { - QUnit.test("view.state should be an alias of view._state with a deprecation", function() { - expect(2); - view = EmberView.create(); - - expectDeprecation(function() { - equal(view._state, view.state, '_state and state are aliased'); - }, 'Usage of `state` is deprecated, use `_state` instead.'); - }); - - QUnit.test("view.states should be an alias of view._states with a deprecation", function() { - expect(2); - view = EmberView.create(); - - expectDeprecation(function() { - equal(view._states, view.states, '_states and states are aliased'); - }, 'Usage of `states` is deprecated, use `_states` instead.'); - }); -} - -QUnit.test("no deprecation is printed if view.state or view._state is not looked up", function() { - expect(2); - expectNoDeprecation(); - - var view = EmberView.create(); - - ok(view, 'view was created'); -});