Merge pull request #1911 from seleniumbase/update-recorder-mode-and-dependencies

Update recorder mode and dependencies

Author: mdmintz

mkdocs_build/requirements.txt

@@ -21,7 +21,7 @@ lunr==0.6.2
 nltk==3.8.1
 tornado==6.3.2
 watchdog==3.0.0
-cairocffi==1.5.1
+cairocffi==1.6.0
 cairosvg==2.7.0
 cssselect2==0.7.0
 tinycss2==1.2.1

requirements.txt

@@ -17,7 +17,7 @@ attrs>=23.1.0;python_version>="3.7"
 PyYAML>=6.0
 certifi>=2023.5.7
 filelock>=3.4.1;python_version<"3.7"
-filelock>=3.12.1;python_version>="3.7"
+filelock>=3.12.2;python_version>="3.7"
 platformdirs>=2.4.0;python_version<"3.7"
 platformdirs>=3.5.3;python_version>="3.7"
 pyparsing>=3.0.7;python_version<"3.7"
@@ -95,10 +95,10 @@ pyotp==2.8.0;python_version>="3.7"
 cffi==1.15.1
 typing-extensions==4.1.1;python_version<"3.7"
 commonmark==0.9.1;python_version<"3.7"
-markdown-it-py==2.2.0;python_version>="3.7"
+markdown-it-py==3.0.0;python_version>="3.8"
 mdurl==0.1.2;python_version>="3.7"
 rich==12.6.0;python_version<"3.7"
-rich==13.4.1;python_version>="3.7"
+rich==13.4.2;python_version>="3.7"
 
 # --- Testing Requirements --- #
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.15.2"
+__version__ = "4.15.3"

seleniumbase/extensions/recorder.zip

@@ -4351,7 +4351,7 @@ def __process_recorded_actions(self):
                     (
                         srt_actions[n - 1][0] == "click"
                         and int(srt_actions[n][3]) - int(srt_actions[n - 1][3])
-                        < 5
+                        < 16
                     )
                     or (
                         srt_actions[n - 1][0] == "js_cl"
@@ -4366,6 +4366,8 @@ def __process_recorded_actions(self):
                 )
             ):
                 srt_actions[n][0] = "_skip"
+                if srt_actions[n - 1][0] == "click":
+                    srt_actions[n - 1][0] = "ch_cl"
         for n in range(len(srt_actions)):
             if (
                 n > 0
@@ -4376,7 +4378,7 @@ def __process_recorded_actions(self):
                     or srt_actions[n][0] == "jq_cl"
                 )
                 and (
-                    int(srt_actions[n][3]) - int(srt_actions[n - 1][3]) < 5
+                    int(srt_actions[n][3]) - int(srt_actions[n - 1][3]) < 16
                 )
             ):
                 srt_actions[n - 1][0] = "_skip"
@@ -4809,6 +4811,9 @@ def __process_recorded_actions(self):
                 and srt_actions[n][2] == srt_actions[n - 1][2]
             ):
                 srt_actions[n][0] = "_skip"
+        for n in range(len(srt_actions)):
+            if srt_actions[n][0] == "ch_cl":
+                srt_actions[n][0] = "js_cl"
 
         # Generate the script from processed actions
         sb_actions = recorder_helper.generate_sbase_code(srt_actions)

seleniumbase/fixtures/base_case.py

@@ -11,7 +11,7 @@
         if (el.id) {
             elid = el.id;
             if (elid.includes(',') || elid.includes('.') ||
-                elid.includes('(') || elid.includes(')') || hasNumber(elid[0]))
+                elid.includes('(') || elid.includes(')') || hasDigit(elid[0]))
                 return cssPathByAttribute(el, 'id');
             selector += '#' + elid;
             path.unshift(selector);
@@ -87,8 +87,6 @@
     return path.join(' > ');
 };
 var ssOccurrences = function(string, subString, allowOverlapping) {
-    string += '';
-    subString += '';
     if (subString.length <= 0)
         return (string.length + 1);
     var n = 0;
@@ -101,9 +99,12 @@
     }
     return n;
 };
-function hasNumber(str) {
+function hasDigit(str) {
     return /\d/.test(str);
 };
+function isGen(str) {
+    return /[_-]\d/.test(str);
+};
 function tagName(el) {
     return el.tagName.toLowerCase();
 };
@@ -121,10 +122,9 @@
 var getBestSelector = function(el) {
     if (!(el instanceof Element)) return;
     el = turnIntoParentAsNeeded(el);
-    child_sep = ' > ';
-    selector_by_id = cssPathById(el);
-    if (!selector_by_id.includes(child_sep)) return selector_by_id;
-    child_count_by_id = ssOccurrences(selector_by_id, child_sep);
+    sel_by_id = cssPathById(el);
+    if (!sel_by_id.includes(' > ') && !isGen(sel_by_id)) return sel_by_id;
+    child_count_by_id = ssOccurrences(sel_by_id, ' > ');
     selector_by_class = cssPathByClass(el);
     tag_name = tagName(el);
     non_id_attributes = [];
@@ -145,7 +145,6 @@
     non_id_attributes.push('data-cy');
     non_id_attributes.push('data-action');
     non_id_attributes.push('data-target');
-    non_id_attributes.push('data-content');
     non_id_attributes.push('data-tooltip');
     non_id_attributes.push('alt');
     non_id_attributes.push('title');
@@ -157,6 +156,7 @@
     non_id_attributes.push('ng-href');
     non_id_attributes.push('href');
     non_id_attributes.push('label');
+    non_id_attributes.push('data-content');
     non_id_attributes.push('class');
     non_id_attributes.push('for');
     non_id_attributes.push('placeholder');
@@ -175,15 +175,15 @@
         else selector_by_attr[i] = cssPathByAttribute(el, n_i_attr);
         all_by_attr[i] = document.querySelectorAll(selector_by_attr[i]);
         num_by_attr[i] = all_by_attr[i].length;
-        if (!selector_by_attr[i].includes(child_sep) &&
+        if (!selector_by_attr[i].includes(' > ') &&
             ((num_by_attr[i] == 1) || (el == all_by_attr[i][0])))
         {
             if (n_i_attr == 'aria-label' || n_i_attr == 'for')
-                if (hasNumber(selector_by_attr[i]))
+                if (hasDigit(selector_by_attr[i]))
                     continue;
             return selector_by_attr[i];
         }
-        child_count_by_attr[i] = ssOccurrences(selector_by_attr[i], child_sep);
+        child_count_by_attr[i] = ssOccurrences(selector_by_attr[i], ' > ');
     }
     basic_tags = [];
     basic_tags.push('h1');
@@ -201,23 +201,24 @@
     contains_tags = [];
     contains_tags.push('a');
     contains_tags.push('b');
-    contains_tags.push('i');
     contains_tags.push('h1');
     contains_tags.push('h2');
     contains_tags.push('h3');
     contains_tags.push('h4');
     contains_tags.push('h5');
-    contains_tags.push('li');
-    contains_tags.push('td');
-    contains_tags.push('th');
     contains_tags.push('code');
     contains_tags.push('mark');
-    contains_tags.push('label');
-    contains_tags.push('small');
     contains_tags.push('button');
+    contains_tags.push('label');
     contains_tags.push('legend');
+    contains_tags.push('li');
+    contains_tags.push('td');
+    contains_tags.push('th');
+    contains_tags.push('i');
+    contains_tags.push('small');
     contains_tags.push('strong');
     contains_tags.push('summary');
+    contains_tags.push('span');
     all_by_tag = [];
     text_content = '';
     if (el.textContent)
@@ -239,9 +240,9 @@
             }
         }
     }
-    best_selector = selector_by_id;
+    best_selector = sel_by_id;
     lowest_child_count = child_count_by_id;
-    child_count_by_class = ssOccurrences(selector_by_class, child_sep);
+    child_count_by_class = ssOccurrences(selector_by_class, ' > ');
     if (child_count_by_class < lowest_child_count) {
         best_selector = selector_by_class;
         lowest_child_count = child_count_by_class;
@@ -622,8 +623,7 @@
             href = grand_el.href; origin = grand_el.origin;
         }
         document.recorded_actions.pop();
-        child_sep = ' > ';
-        child_count = ssOccurrences(selector, child_sep);
+        child_count = ssOccurrences(selector, ' > ');
         if ((tag_name === "a" && !el.hasAttribute('onclick') &&
              child_count > 0 && href.length > 0) ||
             (parent_tag_name === "a" && href.length > 0 &&

seleniumbase/js_code/recorder_js.py

@@ -141,7 +141,7 @@
         "PyYAML>=6.0",
         "certifi>=2023.5.7",
         'filelock>=3.4.1;python_version<"3.7"',
-        'filelock>=3.12.1;python_version>="3.7"',
+        'filelock>=3.12.2;python_version>="3.7"',
         'platformdirs>=2.4.0;python_version<"3.7"',
         'platformdirs>=3.5.3;python_version>="3.7"',
         'pyparsing>=3.0.7;python_version<"3.7"',
@@ -219,10 +219,10 @@
         "cffi==1.15.1",
         'typing-extensions==4.1.1;python_version<"3.7"',
         'commonmark==0.9.1;python_version<"3.7"',  # For old "rich"
-        'markdown-it-py==2.2.0;python_version>="3.7"',  # For new "rich"
+        'markdown-it-py==3.0.0;python_version>="3.8"',  # For new "rich"
         'mdurl==0.1.2;python_version>="3.7"',  # For new "rich"
         'rich==12.6.0;python_version<"3.7"',
-        'rich==13.4.1;python_version>="3.7"',
+        'rich==13.4.2;python_version>="3.7"',
     ],
     extras_require={
         # pip install -e .[allure]