[FEATURE ember-eager-url-update] link-to should generate the url if it eagerly updates it, not use the href because it includes rootURL. Fixes #1244

packages/ember-routing/lib/helpers/link_to.js

@@ -357,11 +357,12 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
       // Schedule eager URL update, but after we've given the transition
       // a chance to synchronously redirect.
       if (Ember.FEATURES.isEnabled("ember-eager-url-update")) {
-        var href = get(this, 'href');
-        if (typeof href === 'undefined') {
-          href = router.generate.apply(router, get(this, 'routeArgs'));
-        }
-        Ember.run.scheduleOnce('routerTransitions', this, this._eagerUpdateUrl, transition, href);
+        // We need to always generate the URL instead of using the href because
+        // the href will include any rootURL set, but the router expects a URL
+        // without it! Note that we don't use the first level router because it
+        // calls location.formatURL(), which also would add the rootURL!
+        var url = router.router.generate.apply(router.router, get(this, 'routeArgs'));
+        Ember.run.scheduleOnce('routerTransitions', this, this._eagerUpdateUrl, transition, url);
       }
     },
 

packages/ember/tests/helpers/link_to_test.js

@@ -480,7 +480,7 @@ test("Issue 4201 - Shorthand for route.index shouldn't throw errors about contex
 });
 
 test("The {{link-to}} helper unwraps controllers", function() {
-  expect(2);
+  expect(3);
 
   Router.map(function() {
     this.route('filter', { path: '/filters/:filter' });
@@ -1410,6 +1410,43 @@ if (Ember.FEATURES.isEnabled("ember-eager-url-update")) {
     basicEagerURLUpdateTest(false);
   });
 
+  test("when link-to eagerly updates url, the path it provides does NOT include the rootURL", function() {
+    expect(2);
+
+    // HistoryLocation is the only Location class that will cause rootURL to be
+    // prepended to link-to href's right now
+    var HistoryTestLocation = Ember.HistoryLocation.extend({
+      // Don't actually touch the URL
+      replaceState: function(path) {},
+      pushState: function(path) {},
+
+      setURL: function(path) {
+        set(this, 'path', path);
+      },
+
+      replaceURL: function(path) {
+        set(this, 'path', path);
+      }
+    });
+
+    container.register('location:historyTest', HistoryTestLocation);
+
+    Router.reopen({
+      location: 'historyTest',
+      rootURL: '/app/'
+    });
+
+    bootApplication();
+
+    // href should have rootURL prepended
+    equal(Ember.$('#about-link').attr('href'), '/app/about');
+
+    Ember.run(Ember.$('#about-link'), 'click');
+
+    // Actual path provided to Location class should NOT have rootURL
+    equal(router.get('location.path'), '/about');
+  });
+
   test("non `a` tags also eagerly update URL", function() {
     basicEagerURLUpdateTest(true);
   });