Merge pull request #9401 from BookingSync/warn-route-queryparams-array

Raise an error when attempting to merge an Array from mergedProperties

Author: mixonic

packages/ember-metal/lib/mixin.js

@@ -20,7 +20,8 @@ import {
   meta as metaFor,
   wrap,
   makeArray,
-  apply
+  apply,
+  isArray
 } from "ember-metal/utils";
 import expandProperties from "ember-metal/expand_properties";
 import {
@@ -210,6 +211,9 @@ function applyConcatenatedProperties(obj, key, value, values) {
 function applyMergedProperties(obj, key, value, values) {
   var baseValue = values[key] || obj[key];
 
+  Ember.assert("You passed in `" + JSON.stringify(value) + "` as the value for `" + key +
+               "` but `" + key + "` cannot be an Array", !isArray(value));
+
   if (!baseValue) { return value; }
 
   var newBase = merge({}, baseValue);

packages/ember-metal/tests/mixin/mergedProperties_test.js

@@ -126,3 +126,21 @@ test("mergedProperties' overwriting methods can call _super", function() {
   var obj = mixin({}, MixinA, MixinB, MixinC);
   equal(obj.foo.meth("WOOT"), "WAT");
 });
+
+test('Merging an Array should raise an error', function() {
+
+  expect(1);
+
+  var MixinA = Mixin.create({
+    mergedProperties: ['foo'],
+    foo: { a: true, b: true, c: true }
+  });
+
+  var MixinB = Mixin.create({
+    foo: ["a"]
+  });
+
+  expectAssertion(function() {
+    mixin({}, MixinA, MixinB);
+  }, 'You passed in `["a"]` as the value for `foo` but `foo` cannot be an Array');
+});

packages/ember/tests/routing/query_params_test.js

@@ -575,6 +575,20 @@ test("can use refreshModel even w URL changes that remove QPs from address bar",
   equal(indexController.get('omg'), 'lol');
 });
 
+test("warn user that routes query params configuration must be an Object, not an Array", function() {
+  expect(1);
+
+  App.ApplicationRoute = Ember.Route.extend({
+    queryParams: [
+      {'commitBy': { replace: true }}
+    ]
+  });
+
+  expectAssertion(function() {
+    bootApplication();
+  }, 'You passed in `[{"commitBy":{"replace":true}}]` as the value for `queryParams` but `queryParams` cannot be an Array');
+});
+
 test("can opt into a replace query by specifying replace:true in the Router config hash", function() {
   expect(2);
   App.ApplicationController = Ember.Controller.extend({