Merge pull request #11792 from martndemus/cleanup-application-then

[CLEANUP beta] Remove Application#then
emberjs · Jul 17, 2015 · 1a16131 · 1a16131
2 parents ddd139c + 339837d
commit 1a16131
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -779,17 +779,6 @@ var Application = Namespace.extend({
 
   initializer(options) {
     this.constructor.initializer(options);
-  },
-
-  /**
-    @method then
-    @private
-    @deprecated
-  */
-  then() {
-    Ember.deprecate('Do not use `.then` on an instance of Ember.Application.  Please use the `.ready` hook instead.', false, { url: 'http://emberjs.com/guides/deprecations/#toc_deprecate-code-then-code-on-ember-application' });
-
-    this._super(...arguments);
   }
 });
 

diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js
@@ -323,18 +323,6 @@ QUnit.test('can specify custom router', function() {
   ok(app.__container__.lookup('router:main') instanceof CustomRouter, 'application resolved the correct router');
 });
 
-QUnit.test('throws helpful error if `app.then` is used', function() {
-  run(function() {
-    app = Application.create({
-      rootElement: '#qunit-fixture'
-    });
-  });
-
-  expectDeprecation(function() {
-    run(app, 'then', function() { return this; });
-  }, /Do not use `.then` on an instance of Ember.Application.  Please use the `.ready` hook instead./);
-});
-
 QUnit.test('registers controls onto to container', function() {
   run(function() {
     app = Application.create({