Merge pull request #14537 from trentmwillis/qp-undefined

[BUGFIX beta] Improve behavior for QPs with undefined values
emberjs · Oct 28, 2016 · d37d38b · d37d38b
2 parents c44f0ce + 098300d
commit d37d38b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
@@ -669,6 +669,8 @@ const EmberRouter = EmberObject.extend(Evented, {
       if (qp) {
         delete queryParams[key];
         queryParams[qp.urlKey] = qp.route.serializeQueryParam(value, qp.urlKey, qp.type);
+      } else if (value === undefined) {
+        return; // We don't serialize undefined values
       } else {
         queryParams[key] = this._serializeQueryParam(value, typeOf(value));
       }

diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
@@ -1231,14 +1231,14 @@ moduleFor('Query Params - main', class extends QueryParamTestCase {
     });
   }
 
-  ['@test Undefined isn\'t deserialized into a string'](assert) {
-    assert.expect(3);
+  ['@test undefined isn\'t serialized or deserialized into a string'](assert) {
+    assert.expect(4);
 
     this.router.map(function() {
       this.route('example');
     });
 
-    this.registerTemplate('application', '{{link-to \'Example\' \'example\' id=\'the-link\'}}');
+    this.registerTemplate('application', '{{link-to \'Example\' \'example\' (query-params foo=undefined) id=\'the-link\'}}');
 
     this.setSingleQPController('example', 'foo', undefined, {
       foo: undefined
@@ -1250,13 +1250,12 @@ moduleFor('Query Params - main', class extends QueryParamTestCase {
       }
     }));
 
-    return this.visit('/').then(() => {
-      let $link = jQuery('#the-link');
-      assert.equal($link.attr('href'), '/example');
-      run($link, 'click');
+    return this.visitAndAssert('/').then(() => {
+      assert.equal(this.$('#the-link').attr('href'), '/example', 'renders without undefined qp serialized');
 
-      let controller = this.getController('example');
-      assert.equal(get(controller, 'foo'), undefined);
+      return this.transitionTo('example', { queryParams: { foo: undefined } }).then(() => {
+        this.assertCurrentPath('/example');
+      });
     });
   }
 

diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -1,4 +1,5 @@
 import { RSVP } from 'ember-runtime';
+import { Route } from 'ember-routing';
 
 import { QueryParamTestCase, moduleFor } from 'internal-test-helpers';
 
@@ -176,4 +177,32 @@ moduleFor('Query Params - async get handler', class extends QueryParamTestCase {
       });
     });
   }
+
+  ['@test undefined isn\'t serialized or deserialized into a string'](assert) {
+    assert.expect(4);
+
+    this.router.map(function() {
+      this.route('example');
+    });
+
+    this.registerTemplate('application', '{{link-to \'Example\' \'example\' (query-params foo=undefined) id=\'the-link\'}}');
+
+    this.setSingleQPController('example', 'foo', undefined, {
+      foo: undefined
+    });
+
+    this.registerRoute('example', Route.extend({
+      model(params) {
+        assert.deepEqual(params, { foo: undefined });
+      }
+    }));
+
+    return this.visitAndAssert('/').then(() => {
+      assert.equal(this.$('#the-link').attr('href'), '/example', 'renders without undefined qp serialized');
+
+      return this.transitionTo('example', { queryParams: { foo: undefined } }).then(() => {
+        this.assertCurrentPath('/example');
+      });
+    });
+  }
 });