From b1cf8f6425d03139f712bfc973e704fb4cfd2e96 Mon Sep 17 00:00:00 2001
From: asakusuma <asa.kusuma@gmail.com>
Date: Mon, 8 Feb 2016 17:53:04 -0800
Subject: [PATCH] [BUGFIX beta] Fixes #12899

Ensure transitionTo returns a transition object. Addresses
https://github.com/emberjs/ember.js/issues/12899
---
 packages/ember-routing/lib/system/router.js | 27 +++++++++++---
 packages/ember/tests/routing/basic_test.js  | 39 +++++++++++++++++++++
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
index b340931196f..755e560c189 100644
--- a/packages/ember-routing/lib/system/router.js
+++ b/packages/ember-routing/lib/system/router.js
@@ -303,9 +303,26 @@ var EmberRouter = EmberObject.extend(Evented, {
 
   _doURLTransition(routerJsMethod, url) {
     var transition = this.router[routerJsMethod](url || '/');
-    return didBeginTransition(transition, this);
+    didBeginTransition(transition, this);
+    return transition;
   },
 
+  /**
+    Transition the application into another route. The route may
+    be either a single route or route path:
+
+    See [Route.transitionTo](http://emberjs.com/api/classes/Ember.Route.html#method_transitionTo) for more info.
+
+    @method transitionTo
+    @param {String} name the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used while
+      transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @private
+  */
   transitionTo(...args) {
     var queryParams;
     if (resemblesURL(args[0])) {
@@ -618,11 +635,11 @@ var EmberRouter = EmberObject.extend(Evented, {
     this._prepareQueryParams(targetRouteName, models, queryParams);
 
     var transitionArgs = routeArgs(targetRouteName, models, queryParams);
-    var transitionPromise = this.router.transitionTo.apply(this.router, transitionArgs);
+    var transition = this.router.transitionTo.apply(this.router, transitionArgs);
 
-    didBeginTransition(transitionPromise, this);
+    didBeginTransition(transition, this);
 
-    return transitionPromise;
+    return transition;
   },
 
   _prepareQueryParams(targetRouteName, models, queryParams) {
@@ -1070,7 +1087,7 @@ function didBeginTransition(transition, router) {
   }
   router.set('targetState', routerState);
 
-  return transition.catch(function(error) {
+  transition.promise = transition.catch(function(error) {
     var errorId = guidFor(error);
 
     if (router._isErrorHandled(errorId)) {
diff --git a/packages/ember/tests/routing/basic_test.js b/packages/ember/tests/routing/basic_test.js
index 0eeb33132de..b438448fa6d 100644
--- a/packages/ember/tests/routing/basic_test.js
+++ b/packages/ember/tests/routing/basic_test.js
@@ -19,6 +19,7 @@ import { A as emberA } from 'ember-runtime/system/native_array';
 import NoneLocation from 'ember-routing/location/none_location';
 import HistoryLocation from 'ember-routing/location/history_location';
 import { getOwner } from 'container/owner';
+import { Transition } from 'router/transition';
 
 var trim = jQuery.trim;
 
@@ -3020,6 +3021,44 @@ QUnit.test('Actions can be handled by inherited action handlers', function() {
   router.send('baz');
 });
 
+QUnit.test('transitionTo returns Transition when passed a route name', function() {
+  expect(1);
+  Router.map(function() {
+    this.route('root', { path: '/' });
+    this.route('bar');
+  });
+
+  var transition = null;
+
+  bootApplication();
+
+  run(function() {
+    transition = router.transitionTo('bar');
+  });
+
+  equal(transition instanceof Transition, true);
+});
+
+QUnit.test('transitionTo returns Transition when passed a url', function() {
+  expect(1);
+  Router.map(function() {
+    this.route('root', { path: '/' });
+    this.route('bar', function() {
+      this.route('baz');
+    });
+  });
+
+  var transition = null;
+
+  bootApplication();
+
+  run(function() {
+    transition = router.transitionTo('/bar/baz');
+  });
+
+  equal(transition instanceof Transition, true);
+});
+
 QUnit.test('currentRouteName is a property installed on ApplicationController that can be used in transitionTo', function() {
   expect(24);