From 292b1a5c2690eb3d4ba0b15e340e9883c10b50c1 Mon Sep 17 00:00:00 2001 From: bgando Date: Wed, 30 Aug 2017 18:14:30 -0400 Subject: [PATCH] Move test to map/map-test.js --- define-test.js | 39 --------------------------------------- map/map-test.js | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/define-test.js b/define-test.js index fbaeb52..2d94fc4 100644 --- a/define-test.js +++ b/define-test.js @@ -5,8 +5,6 @@ var CanList = require("can-define/list/list"); var canBatch = require("can-event/batch/batch"); var each = require("can-util/js/each/each"); var canSymbol = require("can-symbol"); -var canDev = require("can-util/js/dev/dev"); -var DefineMap = require("can-define/map/map"); QUnit.module("can-define"); @@ -1370,40 +1368,3 @@ QUnit.test('define() should add a CID (#246)', function() { var g = new Greeting(); QUnit.ok(g._cid, "should have a CID property"); }); - -if(System.env.indexOf("production") < 0) { - QUnit.test('Setting a value with an object type generates a warning (#148)', function() { - QUnit.expect(2); - var oldwarn = canDev.warn; - canDev.warn = function(mesg) { - QUnit.equal(mesg, "The value for options is set to an object. This will be shared by all instances of the DefineMap. Use a function that returns the object instead.", "Warning is expected message"); - }; - //should issue a warning - DefineMap.extend({ - options: { - value: {} - } - }); - //should issue a warning - DefineMap.extend({ - options: { - value: [] - } - }); - - //should not issue a warning - DefineMap.extend({ - options: { - value: function(){} - } - }); - - //should not issue a warning - DefineMap.extend({ - options: { - value: 2 - } - }); - canDev.warn = oldwarn; - }); -} diff --git a/map/map-test.js b/map/map-test.js index b106333..6fc1273 100644 --- a/map/map-test.js +++ b/map/map-test.js @@ -8,6 +8,7 @@ var compute = require("can-compute"); var assign = require("can-util/js/assign/assign"); var canReflect = require("can-reflect"); var isPlainObject = require("can-util/js/is-plain-object/is-plain-object"); +var canDev = require("can-util/js/dev/dev"); var sealWorks = (function() { try { @@ -836,3 +837,40 @@ QUnit.test("non-Object constructor", function() { QUnit.ok(!isPlainObject(new DefineMap()), "instance of DefineMap is not a plain object"); QUnit.ok(!isPlainObject(new Constructor()), "instance of extended DefineMap is not a plain object"); }); + +if(System.env.indexOf("production") < 0) { + QUnit.test('Setting a value with an object type generates a warning (#148)', function() { + QUnit.expect(2); + var oldwarn = canDev.warn; + canDev.warn = function(mesg) { + QUnit.equal(mesg, "The value for options is set to an object. This will be shared by all instances of the DefineMap. Use a function that returns the object instead.", "Warning is expected message"); + }; + //should issue a warning + DefineMap.extend({ + options: { + value: {} + } + }); + //should issue a warning + DefineMap.extend({ + options: { + value: [] + } + }); + + //should not issue a warning + DefineMap.extend({ + options: { + value: function(){} + } + }); + + //should not issue a warning + DefineMap.extend({ + options: { + value: 2 + } + }); + canDev.warn = oldwarn; + }); +}