[JENKINS-14495] Refined fix - needed to pull uniqueness check out of …

…apply() fn in case we were being passed an Array of nodes. Fixes test failures introduced by dbb100d, and adds a test for it now that I know it can be done.
jenkinsci · Aug 3, 2012 · f39fbdb · f39fbdb
1 parent dbb100d
commit f39fbdb
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 15 deletions.
diff --git a/test/src/test/java/scripts/BehaviorTest.java b/test/src/test/java/scripts/BehaviorTest.java
@@ -25,6 +25,7 @@
 
 import com.gargoylesoftware.htmlunit.ScriptResult;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.HudsonTestCase;
 
 /**
@@ -52,4 +53,12 @@ public void testCssSelectors() throws Exception {
     private int asInt(ScriptResult r) {
         return ((Double)r.getJavaScriptResult()).intValue();
     }
+
+    @Bug(14495)
+    public void testDuplicateRegistrations() throws Exception {
+        HtmlPage p = createWebClient().goTo("self/testDuplicateRegistrations");
+        ScriptResult r = p.executeJavaScript("document.getElementsBySelector('DIV.a')[0].innerHTML");
+        assertEquals("initial and appended yet different", r.getJavaScriptResult().toString());
+    }
+
 }
diff --git a/test/src/test/resources/scripts/BehaviorTest/testDuplicateRegistrations.jelly b/test/src/test/resources/scripts/BehaviorTest/testDuplicateRegistrations.jelly
@@ -0,0 +1,48 @@
+<!--
+The MIT License
+
+Copyright (c) 2012, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <l:layout title="">
+    <l:main-panel>
+      <script>
+        Behaviour.register({
+          ".a" : function (e) {
+            e.innerHTML += ' and appended';
+          }
+        });
+        Behaviour.register({
+          ".a" : function (e) {
+            e.innerHTML += ' and appended';
+          }
+        });
+        Behaviour.register({
+          ".a" : function (e) {
+            e.innerHTML += ' yet different';
+          }
+        });
+      </script>
+      <div class="a">initial</div>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>
diff --git a/war/src/main/webapp/scripts/behavior.js b/war/src/main/webapp/scripts/behavior.js
@@ -68,25 +68,24 @@ var Behaviour = {
         var behaviorsBySelector = {};
         Behaviour.list._each(function(sheet) {
             for (var selector in sheet){
-                function apply(n) {
-                    var behavior = sheet[selector];
-                    var behaviors = behaviorsBySelector[selector];
-                    if (behaviors == null) {
-                        behaviors = [];
-                        behaviorsBySelector[selector] = behaviors;
-                    }
-                    if (behaviors.indexOf(behavior.toString()) == -1) {
-                        behaviors.push(behavior.toString());
+                var behavior = sheet[selector];
+                var behaviors = behaviorsBySelector[selector];
+                if (behaviors == null) {
+                    behaviors = [];
+                    behaviorsBySelector[selector] = behaviors;
+                }
+                if (behaviors.indexOf(behavior.toString()) == -1) {
+                    behaviors.push(behavior.toString());
+                    function apply(n) {
                         var list = findElementsBySelector(n,selector,includeSelf);
                         if (list.length>0)  // just to simplify setting of a breakpoint.
                             list._each(sheet[selector]);
                     }
-                }
-
-                if (startNode instanceof Array) {
-                    startNode._each(apply)
-                } else {
-                    apply(startNode);
+                    if (startNode instanceof Array) {
+                        startNode._each(apply)
+                    } else {
+                        apply(startNode);
+                    }
                 }
             }
         });