FLUID-4128: Fix and test cases for renderer expansion bug in conditio…

…nal expander, where context-relative resolved values are converted to string type
fluid-project · Mar 2, 2011 · c6298c9 · c6298c9
1 parent f5f8564
commit c6298c9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/src/webapp/framework/core/js/Fluid.js b/src/webapp/framework/core/js/Fluid.js
@@ -45,8 +45,8 @@ var fluid = fluid || fluid_1_4;
     fluid.fail = function (message) {
         fluid.setLogging(true);
         fluid.log(message.message ? message.message : message);
-        throw new Error(message);
-        //message.fail(); // Intentionally cause a browser error by invoking a nonexistent function.
+        //throw new Error(message);
+        message.fail(); // Intentionally cause a browser error by invoking a nonexistent function.
     };
 
     // Logging

diff --git a/src/webapp/framework/core/js/FluidIoC.js b/src/webapp/framework/core/js/FluidIoC.js
@@ -596,7 +596,6 @@ var fluid_1_4 = fluid_1_4 || {};
         while (typeof(string) === "string") {
             var i1 = string.indexOf("${");
             var i2 = string.indexOf("}", i1 + 2);
-            var all = (i1 === 0 && i2 === string.length - 1); 
             if (i1 !== -1 && i2 !== -1) {
                 var parsed;
                 if (string.charAt(i1 + 2) === "{") {
@@ -607,6 +606,7 @@ var fluid_1_4 = fluid_1_4 || {};
                     parsed = {path: string.substring(i1 + 2, i2)};
                 }
                 var subs = options.fetcher(parsed);
+                var all = (i1 === 0 && i2 === string.length - 1); 
                 // TODO: test case for all undefined substitution
                 if (subs === undefined || subs === null) {
                     return subs;

diff --git a/src/webapp/framework/renderer/js/RendererUtilities.js b/src/webapp/framework/renderer/js/RendererUtilities.js
@@ -278,7 +278,7 @@ fluid_1_4 = fluid_1_4 || {};
         } else if (options.condition.expander) {
             condition = config.expander(options.condition);
         } else {
-            condition = options.condition;
+            condition = config.expandLight(options.condition);
         }
         var tree = (condition ? options.trueTree : options.falseTree);
         if (!tree) {

diff --git a/src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js b/src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
@@ -790,6 +790,35 @@ fluid.registerNamespace("fluid.tests");
             return;
         });
 
+        protoTests.test("FLUID-4128 test: Literal booleans within repetition/condition expander", function() {
+            var model = {conditions: [true, false, true, true, false]};
+            var expander = fluid.renderer.makeProtoExpander({model: model});
+            var protoTree = {
+                expander: {
+                    type: "fluid.renderer.repeat",
+                    repeatID: "repeat-row:",
+                    pathAs: "row",
+                    valueAs: "rowValue",
+                    controlledBy: "conditions",
+                    tree: {
+                        expander: {
+                            type: "fluid.renderer.condition",
+                            condition: "{rowValue}",
+                            trueTree: {
+                                leafValue: "{rowValue}"
+                            }
+                        }
+                    }
+                }
+            }
+            var expanded = expander(protoTree);
+            jqUnit.assertEquals("Only three rows produced", 3, expanded.children.length);
+            var protoTree2 = fluid.copy(protoTree);
+            protoTree.expander.tree.expander.condition = "${{rowValue}}";
+            var expanded = expander(protoTree);
+            jqUnit.assertEquals("Only three rows produced - alternative reference style", 3, expanded.children.length);
+        });
+
         protoTests.test("FLUID-3658 test: selection to inputs expander", function () {
             var model = { };
             var expopts = {ELstyle: "${}", model: model};
@@ -811,7 +840,7 @@ fluid.registerNamespace("fluid.tests");
                             }
                         },
                         "permissions-record-type": "${fields.permissions.0.recordType}"
-                     }
+                    }
                     ]
                 }
             };