Merge pull request emberjs#3439 from alexspeller/fix-history-location

[FEATURE query-params] Fix history location

Author: machty

packages/ember-routing/lib/location/history_location.js

@@ -52,10 +52,16 @@ Ember.HistoryLocation = Ember.Object.extend({
   */
   getURL: function() {
     var rootURL = get(this, 'rootURL'),
-        url = get(this, 'location').pathname;
+        location = get(this, 'location'),
+        path = location.pathname;
 
     rootURL = rootURL.replace(/\/$/, '');
-    url = url.replace(rootURL, '');
+    var url = path.replace(rootURL, '');
+
+    if (Ember.FEATURES.isEnabled("query-params")) {
+      var search = location.search || '';
+      url += search;
+    }
 
     return url;
   },

packages/ember/tests/routing/query_params_test.js

@@ -446,4 +446,21 @@ if (Ember.FEATURES.isEnabled("query-params")) {
 
     equal(editCount, 2, 'set up the edit route twice without failure');
   });
+
+  test("History location can handle queryparams", function() {
+    var location = {
+      pathname: "/foo",
+      search: "?bar=baz"
+    };
+
+    var history = {
+      pushState: Ember.K,
+      replaceState: Ember.K
+    };
+
+    var historyLocation = Ember.HistoryLocation.create({location: location, history: history});
+
+    equal(historyLocation.getURL(), "/foo?bar=baz", "The query params are present");
+  });
+
 }