FLUID-5800: Working test case for merging during exception - only wor…

…king in standalone due to jQuery not being in strict mode!
fluid-project · Nov 2, 2015 · 09e5cb7 · 09e5cb7
1 parent c9d974c
commit 09e5cb7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/framework/core/js/Fluid.js b/src/framework/core/js/Fluid.js
@@ -1821,6 +1821,9 @@ var fluid = fluid || fluid_2_0_0;
     // it has long been disused by DataBinding itself
     fluid.model.mergeModel = function (target, source) {
         if (fluid.isPlainObject(target)) {
+            if (source === fluid.NO_VALUE) {
+                console.log("NOW");
+            }
             var copySource = fluid.copy(source);
             $.extend(true, source, target);
             $.extend(true, source, copySource);

diff --git a/tests/framework-tests/core/html/FluidIoC-test.html b/tests/framework-tests/core/html/FluidIoC-test.html
@@ -1,4 +1,4 @@
-s<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

diff --git a/tests/framework-tests/core/js/FluidIoCTests.js b/tests/framework-tests/core/js/FluidIoCTests.js
@@ -701,6 +701,31 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         });
         jqUnit.assertLeftHand("Merged grades in correct left-to-right order with direct grade arguments", expected, merged2.options);
     });
+
+    fluid.defaults("fluid.tests.FLUID5800base", {
+        events: {
+            onUserToken: null
+        },
+        listeners: {
+            onUserToken: [{
+               priority: "first",
+               listener: "gpii.flowManager.setUserToken",
+               args: ["{that}", "{arguments}.0"]
+            }, "{that}.getPreferences"]
+        }
+    });
+
+    jqUnit.test("FLUID-5800 merge corruption", function () {
+        jqUnit.expect(1); // this used to throw on registration
+        fluid.defaults("fluid.tests.FLUID5800mid", {
+            gradeNames: "fluid.tests.FLUID5800base",
+            listeners: {
+                onUserToken: "{that}.getDeviceContext"
+            }
+        });
+        var def = fluid.defaults("fluid.tests.FLUID5800mid");
+        console.log(def);
+    });
 
     /** Listener merging tests **/