Minor enhancements.

- Employ more strategies to get label text
- Remove redundant equal sign in Robot Framework template
- Bug fixes and follow static analysis results
- Add more unit tests
- Bump version to 1.2.2

Author: rickypc

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.2.2 (2015.08.15)
+
+* Employ more strategies to get label text
+* Remove redundant equal sign in Robot Framework template
+* Bug fixes and follow static analysis results
+* Add more unit tests
+
 ### 1.2.1 (2015.07.30)
 
 * Add rating link in share section

package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium-page-object-generator",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A nimble and flexible Selenium Page Object Model generator to improve agile testing process velocity.",
   "dependencies": {},
   "devDependencies": {
@@ -18,7 +18,9 @@
     "gulp-minify-html": "^1.0.3",
     "gulp-replace": "^0.5.3",
     "gulp-uglify": "^1.2.0",
-    "gulp-zip": "^3.0.2"
+    "gulp-zip": "^3.0.2",
+    "jquery": "^2.1.4",
+    "jsdom": ">= 0.1.23 < 4.0.0"
   },
   "keywords": [
     "Selenium",

src/chrome/assets/js/generator.js

@@ -25,21 +25,27 @@ window.POG=(function() {
 
     function getClosestSibling(node, siblings) {
         var copies = siblings.slice(0);
-        copies.push(node);
-        var closest = copies.length - 1;
-        var nodeIndex = [].indexOf.call(copies, node);
+        copies.unshift(node);
+        var copiesLength = copies.length;
+        var closest = 1;
+
+        if (closest > copiesLength) {
+            closest = 0;
+        }
+
+        var nodeIndex = 0;
         var siblingIndex = closest;
 
-        for (var i = 0, j = copies.length; i < j; i++) {
+        for (var i = 0; i < copiesLength; i++) {
             var delta = Math.abs(nodeIndex - i);
 
-            if (delta < closest) {
+            if (delta > closest) {
                 closest = delta;
                 siblingIndex = i;
             }
         }
 
-        return (siblingIndex === (copies.length - 1)) ? null : copies[siblingIndex];
+        return (siblingIndex === 0) ? null : copies[siblingIndex];
     }
 
     function getComments(root) {
@@ -154,22 +160,18 @@ window.POG=(function() {
         var text = '';
 
         if (node.id) {
-            text = getLabelTextFor(node.id);
+            text = getLabelTextFor(node, 'id');
         }
 
         if (text === '' && node.name) {
             // non-standard, but it happens
-            text = getLabelTextFor(node.name);
+            text = getLabelTextFor(node, 'name');
         }
 
         if (text === '') {
             // find label from siblings
             // TODO: should use more aggressive collector
-            labels = Array.filter([].slice.call(node.parentNode.children),
-                function(item, index) {
-                    return item.nodeName === 'LABEL';
-                });
-
+            var labels = node.parentNode.querySelectorAll('label');
             var label = getClosestSibling(node, labels);
 
             if (label) {
@@ -181,17 +183,31 @@ window.POG=(function() {
         return text;
     }
 
-    function getLabelTextFor(identifier) {
-        var label = null;
+    function getLabelTextFor(node, attribute) {
+        var identifier = node.getAttribute(attribute) || node[attribute] || '';
         var text = '';
 
         if (identifier) {
-            label = document.querySelector('label[for="' + identifier + '"]');
+            var label = document.querySelector('label[for="' + identifier + '"]');
 
             if (label) {
                 text = label.textContent || label.innerText || '';
                 text = text.trim();
             }
+
+            if (text === '') {
+                var identifierLowered = identifier.toLowerCase();
+                var labels = Array.filter(document.querySelectorAll('label[for]'), function(item) {
+                    return item.getAttribute('for').toLowerCase() === identifierLowered;
+                });
+
+                label = getClosestSibling(node, labels);
+
+                if (label) {
+                    text = label.textContent || label.innerText || '';
+                    text = text.trim();
+                }
+            }
         }
 
         return text;