cucu 1.3.13__py3-none-any.whl → 1.3.15__py3-none-any.whl

cucu/cli/core.py

@@ -524,6 +524,7 @@ def _generate_report(
     report_folder: Path,
     only_failures: False,
     junit_folder: Path | None = None,
+    combine: bool = False,
 ):
     if report_folder.exists():
         shutil.rmtree(report_folder)
@@ -531,7 +532,7 @@ def _generate_report(
     report_folder.mkdir(parents=True, exist_ok=True)
 
     if results_dir.exists():
-        consolidate_database_files(results_dir)
+        consolidate_database_files(results_dir, combine)
 
     report_location = reporter.generate(
         results_dir, report_folder, only_failures=only_failures
@@ -590,6 +591,12 @@ def _generate_report(
     "the same location as --results",
     type=click.Path(path_type=Path),
 )
+@click.option(
+    "--combine",
+    default=False,
+    is_flag=True,
+    help="combine multiple cucu_runs into a single report",
+)
 def report(
     results_dir: Path,
     only_failures,
@@ -597,6 +604,7 @@ def report(
     show_skips,
     output: Path,
     junit: Path,
+    combine: bool,
 ):
     """
     generate a test report from a results directory
@@ -627,6 +635,7 @@ def report(
         report_folder=output,
         only_failures=only_failures,
         junit_folder=junit,
+        combine=combine,
     )
 
 

cucu/db.py

@@ -411,16 +411,23 @@ def get_first_cucu_run_filepath():
     return run_record.filepath
 
 
-def consolidate_database_files(results_dir):
+def consolidate_database_files(results_dir, combine=False):
     # This function would need a more advanced approach with peewee, so for now, keep using sqlite3 for consolidation
     results_path = Path(results_dir)
     target_db_path = results_path / "run.db"
     if not target_db_path.exists():
         create_database_file(target_db_path)
 
-    db_files = [
-        db for db in results_path.glob("**/run*.db") if db.name != "run.db"
-    ]
+    if not combine:
+        db_files = [
+            db for db in results_path.glob("**/run*.db") if db.name != "run.db"
+        ]
+    else:
+        # include all run.db files in all subdirectories
+        db_files = [
+            db for db in results_path.rglob("run*.db") if db != Path("run.db")
+        ]
+
     tables_to_copy = ["cucu_run", "worker", "feature", "scenario", "step"]
     with sqlite3.connect(target_db_path) as target_conn:
         target_cursor = target_conn.cursor()
@@ -451,7 +458,7 @@ def consolidate_database_files(results_dir):
                     )
                     target_conn.commit()
 
-            if db_file.name != "run.db":
+            if not combine and db_file.name != "run.db":
                 # remove the worker db files
                 db_file.unlink()
 

cucu/reporter/external/manage_scenario_highlights.js

@@ -0,0 +1,69 @@
+;
+function fitHighlightToImage(highlightDiv) {
+  console.log(highlightDiv);
+
+  // Every highlight element is expected to have an ID of the form
+  // <image ID>-highlight . Get the image ID here.
+  const sliceEndIndex = highlightDiv.id.length - "-highlight".length;
+
+  const targetImgId = highlightDiv.id.slice(0, sliceEndIndex);
+  const targetImg = document.querySelector(`img#${targetImgId}`);
+  const imgViewportRect = targetImg.getBoundingClientRect();
+  // Compute absolute coordinates relative to the whole document
+  const targetDimensions = {
+    height: imgViewportRect["height"],
+    width: imgViewportRect["width"],
+    top: imgViewportRect["top"] + window.pageYOffset,
+    left: imgViewportRect["left"] + window.pageXOffset,
+  };
+
+  const updatedHighlightStyle = [
+    "position:absolute",
+    `height:${targetDimensions["height"] * highlightDiv.getAttribute("height-ratio")}px`,
+    `width:${targetDimensions["width"] * highlightDiv.getAttribute("width-ratio")}px`,
+    `top:${(targetDimensions["height"] * highlightDiv.getAttribute("top-ratio")) + targetDimensions["top"]}px`,
+    `left:${(targetDimensions["width"] * highlightDiv.getAttribute("left-ratio")) + targetDimensions["left"]}px`,
+    "border:2px solid magenta",
+    "border-radius:2px",
+  ].join(";");
+  highlightDiv.style = updatedHighlightStyle;
+};
+
+function resizeAllHighlights(){
+  const highlights = document.querySelectorAll(".step-image-highlight");
+  highlights.forEach(h => fitHighlightToImage(h));
+};
+
+// The <summary> elements make the DOM jump around.
+// The delayed resizeAllHighlights helps make sure all the highlights
+// from lower down the page get into the right place after things settle.
+document.querySelectorAll("summary").forEach(
+  e => {
+    e.addEventListener("click", resizeAllHighlights);
+    e.addEventListener(
+      "click",
+      () => setTimeout(resizeAllHighlights, 10)
+    );
+  }
+);
+// The td.data-toggles cause an animation that takes a lot longer than
+// the one from the <summary> elements. As before, the fast
+// resizeAllHighlights makes the ones the user can see first jump into
+// place, then the delayed one helps put the ones lower down into place.
+document.querySelectorAll("td[data-toggle=collapse").forEach(
+  e => {
+    e.addEventListener(
+      "click",
+      () => setTimeout(resizeAllHighlights, 10)
+    );
+    e.addEventListener(
+      "click",
+      // 400ms value was determined experimentally.
+      // It's approximately the duration of the animation triggered
+      // by clicking on these elements
+      () => setTimeout(resizeAllHighlights, 400)
+    );
+  }
+);
+window.onload = resizeAllHighlights;
+window.onresize = resizeAllHighlights;

cucu/reporter/html.py

@@ -14,7 +14,11 @@ import cucu.db as db
 from cucu import format_gherkin_table, logger
 from cucu.ansi_parser import parse_log_to_html
 from cucu.config import CONFIG
-from cucu.utils import ellipsize_filename, get_step_image_dir
+from cucu.utils import (
+    ellipsize_filename,
+    generate_short_id,
+    get_step_image_dir,
+)
 
 
 def escape(data):
@@ -130,6 +134,7 @@ def generate(results, basepath, only_failures=False):
                             "timestamp": db_step.end_at or "",
                         },
                         "substep": db_step.is_substep,
+                        "screenshots": db_step.screenshots,
                     }
 
                     if db_step.text:
@@ -281,8 +286,6 @@ def generate(results, basepath, only_failures=False):
             scenario_started_at = None
             for step in scenario["steps"]:
                 total_steps += 1
-                image_dir = get_step_image_dir(step_index, step["name"])
-                image_dirpath = os.path.join(scenario_filepath, image_dir)
 
                 # Handle section headings with different levels (# to ####)
                 if step["name"].startswith("#"):
@@ -292,32 +295,52 @@ def generate(results, basepath, only_failures=False):
                         f"h{step['name'][:4].count('#') + 1}"
                     )
 
-                if os.path.exists(image_dirpath):
-                    _, _, image_names = next(os.walk(image_dirpath))
-                    images = []
-                    for image_name in image_names:
-                        words = image_name.split("-", 1)
-                        index = words[0].strip()
+                images = []
+                image_dir = get_step_image_dir(step_index, step["name"])
+                image_dirpath = os.path.join(scenario_filepath, image_dir)
+                for screenshot_index, screenshot in enumerate(step["screenshots"]):
+                    filename = os.path.split(screenshot["filepath"])[-1]
+                    filepath = os.path.join(image_dirpath, filename)
+                    if not os.path.exists(filepath):
+                        continue
+                    label = screenshot.get("label", step["name"])
+                    highlight = None
+                    if (
+                        screenshot["location"]
+                        and not CONFIG["CUCU_SKIP_HIGHLIGHT_BORDER"]
+                    ):
+                        window_height = screenshot["size"]["height"]
+                        window_width = screenshot["size"]["width"]
                         try:
-                            # Images with label should have a name in the form:
-                            # 0000 - This is the image label.png
-                            label, _ = os.path.splitext(words[1].strip())
-                        except IndexError:
-                            # Images with no label should instead look like:
-                            # 0000.png
-                            # so we default to the step name in this case.
-                            label = step["name"]
-
-                        images.append(
-                            {
-                                "src": urllib.parse.quote(
-                                    os.path.join(image_dir, image_name)
-                                ),
-                                "index": index,
-                                "label": label,
+                            highlight = {
+                                "height_ratio": screenshot["location"][
+                                    "height"
+                                ]
+                                / window_height,
+                                "width_ratio": screenshot["location"]["width"]
+                                / window_width,
+                                "top_ratio": screenshot["location"]["y"]
+                                / window_height,
+                                "left_ratio": screenshot["location"]["x"]
+                                / window_width,
                             }
-                        )
-                    step["images"] = sorted(images, key=lambda x: x["index"])
+                        except TypeError:
+                            # If any of the necessary properties is absent,
+                            # then oh well, no highlight this time.
+                            pass
+                    screenshot_id = f"step-img-{screenshot.get("step_run_id", generate_short_id())}-{screenshot_index:0>4}"
+                    images.append(
+                        {
+                            "src": urllib.parse.quote(
+                                os.path.join(image_dir, filename)
+                            ),
+                            "index": screenshot_index,
+                            "label": label,
+                            "id": screenshot_id,
+                            "highlight": highlight,
+                        }
+                    )
+                step["images"] = sorted(images, key=lambda x: x["index"])
 
                 if "result" in step:
                     if step["result"]["status"] in ["failed", "passed"]:

cucu/reporter/templates/scenario.html

@@ -150,7 +150,10 @@
                     <summary style="color: dimgray;">images ({{ step['images']|length }} images)</summary>
                     <div style="margin: 10px 0 0 0;">
                         {% for image in step['images'] %}
-                            <img class="mx-auto d-block img-fluid shadow bg-white rounded" style="margin-bottom:15px" alt='{{ image["label"] }}' title='{{ image["label"] }}' src='{{ image["src"] }}'></img>
+                            <img class="mx-auto d-block img-fluid shadow bg-white rounded" id='{{image['id']}}' style="margin-bottom:15px" alt='{{ image["label"] }}' title='{{ image["label"] }}' src='{{ image["src"] }}'></img>
+                            {% if image['highlight'] %}
+                            <div class="step-image-highlight" id='{{ image["id"]}}-highlight' height-ratio='{{ image['highlight']['height_ratio'] }}' width-ratio='{{ image['highlight']['width_ratio'] }}' top-ratio='{{ image['highlight']['top_ratio'] }}' left-ratio='{{ image['highlight']['left_ratio'] }}'></div>
+                            {% endif %}
                         {% endfor %}
                     </div>
                 </details>
@@ -222,4 +225,5 @@
             });
         });
     </script>
+    <script src="../../external/manage_scenario_highlights.js"></script>
 {% endblock %}

cucu/steps/webserver_steps.py

@@ -35,7 +35,7 @@ def run_webserver_for_scenario(ctx, directory, variable):
     CONFIG[variable] = str(port)
 
     with socket.create_connection(("localhost", port), timeout=5):
-        logger.debug(f"Webserver is running at {port=}port")
+        logger.debug(f"Webserver is running at {port=}")
 
     def shutdown_webserver(_):
         httpd.shutdown()

cucu/utils.py

@@ -245,56 +245,42 @@ def take_screenshot(ctx, step_name, label="", element=None):
         os.mkdir(screenshot_dir)
 
     if len(label) > 0:
-        label = f" - {CONFIG.hide_secrets(label).replace('/', '_')}"
-    filename = f"{CONFIG['__STEP_SCREENSHOT_COUNT']:0>4}{label}.png"
+        label = CONFIG.hide_secrets(label).replace("/", "_")
+    filename = f"{CONFIG['__STEP_SCREENSHOT_COUNT']:0>4} - {label}.png"
     filename = ellipsize_filename(filename)
     filepath = os.path.join(screenshot_dir, filename)
 
-    if CONFIG["CUCU_SKIP_HIGHLIGHT_BORDER"] or not element:
-        ctx.browser.screenshot(filepath)
-    else:
-        location = element.location
-        border_width = 4
-        x, y = location["x"] - border_width, location["y"] - border_width
-        size = element.size
-        width, height = size["width"], size["height"]
-
-        position_css = f"position: absolute; top: {y}px; left: {x}px; width: {width}px; height: {height}px; z-index: 9001;"
-        visual_css = "border-radius: 4px; border: 4px solid #ff00ff1c; background: #ff00ff05; filter: drop-shadow(magenta 0 0 10px);"
-
-        script = f"""
-            (function() {{ // double curly-brace to escape python f-string
-                var body = document.querySelector('body');
-                var cucu_border = document.createElement('div');
-                cucu_border.setAttribute('id', 'cucu_border');
-                cucu_border.setAttribute('style', '{position_css} {visual_css}');
-                body.append(cucu_border);
-            }})();
-        """
-        ctx.browser.execute(script)
-
-        ctx.browser.screenshot(filepath)
-
-        clear_highlight = """
-            (function() {
-                var body = document.querySelector('body');
-                var cucu_border = document.getElementById('cucu_border');
-                body.removeChild(cucu_border);
-            })();
-        """
-        ctx.browser.execute(clear_highlight, element)
-
+    ctx.browser.screenshot(filepath)
+    element_info = {
+        "x": None,
+        "y": None,
+        "height": None,
+        "width": None,
+    }
+    if element:
+        element_info.update(element.rect)
+    # driver.get_window_size returns the size of the window the OS draws for
+    # the browser, not the window the browser uses to display the DOM.
+    # If we go through JavaScript, we ignore the height of the adress bar
+    # and such.
+    script = """
+        function getDimensionsOfCurrentWindow() {
+          const windowSize = {
+            width: window.innerWidth,
+            height: window.innerHeight,
+          };
+          return windowSize;
+        };
+        return getDimensionsOfCurrentWindow();
+    """
+    browser_window_size = ctx.browser.execute(script)
     screenshot = {
         "step_name": step_name,
         "label": label,
         "element": element,
-        "location": f"({element.location['x']},{element.location['y']})"
-        if element
-        else "",
-        "size": f"({element.size['width']},{element.size['height']})"
-        if element
-        else "",
+        "location": element_info,
         "filepath": filepath,
+        "size": browser_window_size,
     }
     step.screenshots.append(screenshot)
 

{cucu-1.3.13.dist-info → cucu-1.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cucu
-Version: 1.3.13
+Version: 1.3.15
 Summary: Easy BDD web testing
 Keywords: cucumber,selenium,behave
 Author: Domino Data Lab, Rodney Gomes, Cedric Young, Xin Dong, Kavya Yakkati, Kevin Garton, Joy Liao

{cucu-1.3.13.dist-info → cucu-1.3.15.dist-info}/RECORD

@@ -7,12 +7,12 @@ cucu/browser/frames.py,sha256=IW7kzRJn5PkbMaovIelAeCWO-T-2sOTwqaYBw-0-LKU,3545
 cucu/browser/selenium.py,sha256=eUC2DZkhUIZi70sVTaNE_0AhanGTceyx_pCLIT7PN6o,13299
 cucu/browser/selenium_tweaks.py,sha256=oUIhWVhBZbc9qsmQUJMpIr9uUWKxtgZBcnySWU6Yttk,879
 cucu/cli/__init__.py,sha256=uXX5yVG1konJ_INdlrcfMg-Tt_5_cSx29Ed8R8v908A,62
-cucu/cli/core.py,sha256=rdnMNvTletzjFeA1JFzc2wF_Hd_YI0KFMe1M0eAvA00,27298
+cucu/cli/core.py,sha256=-3TWxedDNMR1Jg7qNF5GLdvgn7KgthMwQ0hfeyJi1eg,27509
 cucu/cli/run.py,sha256=6w7lkgf3iWsg9lqrmCJEWmOHGRXJFbVyZItVGGk_9gM,6105
 cucu/cli/steps.py,sha256=5-aOGf3fmcnge4pcFM__4shcA3PZwjKe6oZN6XKY1pM,4215
 cucu/cli/thread_dumper.py,sha256=Z3XnYSxidx6pqjlQ7zu-TKMIYZWk4z9c5YLdPkcemiU,1593
 cucu/config.py,sha256=Pi59JiRcCdzugDwraM4R1hXRkP52123z0hSP8X6lyzI,14970
-cucu/db.py,sha256=ofJZQjGw_dBp-WpgG-CjEXOzotagi1n_T_AGL2QRSVY,15082
+cucu/db.py,sha256=ZadBBvwwzlHTi-MXMrHlSudpn61zxaTQsDMfCjSGnNk,15323
 cucu/edgedriver_autoinstaller/README.md,sha256=tDkAWIqgRdCjt-oX1nYqikIC_FfiOEM2-pc5S5VbRLo,84
 cucu/edgedriver_autoinstaller/__init__.py,sha256=fo6xJJPvcc5Xvni8epXfxDoPxJH5_b6Vk2jD9JTwfRs,969
 cucu/edgedriver_autoinstaller/utils.py,sha256=iRKTww77CGaTAntt_QDvxlKPxpMU4otx95OeD97khcM,6802
@@ -54,14 +54,15 @@ cucu/reporter/external/dataTables.bootstrap.min.css,sha256=AVjWb9eSGQ0-3f4WNiVU1
 cucu/reporter/external/dataTables.bootstrap.min.js,sha256=H_ZJHj902eqGocNJYjkD3OButj68n-T2NSBjnfV2Qok,4401
 cucu/reporter/external/jquery-3.5.1.min.js,sha256=9_aliU8dGd2tb6OSsuzixeV4y_faTqgFtohetphbbj0,89476
 cucu/reporter/external/jquery.dataTables.min.js,sha256=XNhaB1tBOSFMHu96BSAJpZOJzfZ4SZI1nwAbnwry2UY,90265
+cucu/reporter/external/manage_scenario_highlights.js,sha256=UAGC3CLzTqDdPI9d2tFOeww9afVS5S4J1Elg96x60cY,2669
 cucu/reporter/external/popper.min.js,sha256=pS96pU17yq-gVu4KBQJi38VpSuKN7otMrDQprzf_DWY,19188
 cucu/reporter/favicon.png,sha256=9ikXLAmzfQzy2NQps_8CGaZog2FvQrOX8nnSZ0e1UmM,2161
-cucu/reporter/html.py,sha256=MpTwYmd-_GycFh3zqQrmSp6Wp-FBJ1CvfatV5bBxpbs,19925
+cucu/reporter/html.py,sha256=8wXF9ntF5Rkmoe-LWHY0YgxbSwuJGdZ1XTKWD-LFbBE,21009
 cucu/reporter/templates/feature.html,sha256=IBkwGiul-sRO5lT8q8VFXMUJx1owsAd1YbdDzziSjKw,3645
 cucu/reporter/templates/flat.html,sha256=inx9wBo23SKsETA5BqU3GAxM7WaLTsDgCyL_D7TPpdA,2531
 cucu/reporter/templates/index.html,sha256=pJ1eojL19EIUuIiqtALPm3atTabKJb7M1FwGzWpGkdg,2818
 cucu/reporter/templates/layout.html,sha256=2iDRbm8atO8mgHWgijIvDCrBMKvcP6YHrmr95WtJiE4,4561
-cucu/reporter/templates/scenario.html,sha256=yOAVb3cHMDvf1xzHatbXdpJnhClVMwMMyZrTSU9Nz9o,11735
+cucu/reporter/templates/scenario.html,sha256=LWjSj2PNcBpC1EnxCmgnzG8ZLDIXEDF4F1oexfFfx4E,12238
 cucu/steps/__init__.py,sha256=seSmASBlWu6-6wbFbvEbPwigBcRXiYP18C4X_2cW8Ng,753
 cucu/steps/base_steps.py,sha256=0fPvdaKoan8lMAKrDnK0-zrALpxm11P1zVAY5CN7iXA,1893
 cucu/steps/browser_steps.py,sha256=iTRl5ffpf2YrFk5qh655WFHAeSOwoE3HFhmXhjsZtao,12687
@@ -86,9 +87,9 @@ cucu/steps/table_steps.py,sha256=Xf_9sMZXJRaO64Sd12vCnBm9Olxq1qyyfHHpy_hveWI,137
 cucu/steps/tables.js,sha256=Os2a7Fo-cg03XVli7USvcnBVad4N7idXr-HBuzdLvVQ,945
 cucu/steps/text_steps.py,sha256=Jj_GHoHeemNwVdUOdqcehArNp7WM-WMjljA4w0pLXuw,2576
 cucu/steps/variable_steps.py,sha256=WSctH3_xcxjijGPYZlxp-foC_SIAAKtF__saNtgZJbk,2966
-cucu/steps/webserver_steps.py,sha256=wWkpSvcSMdiskPkh4cqlepWx1nkvEpTU2tRXQmPDbyo,1410
-cucu/utils.py,sha256=LCcs8sMzvdvH05N8P5QYO4lO6j-_PQC530mEAD96go8,10957
-cucu-1.3.13.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-cucu-1.3.13.dist-info/entry_points.txt,sha256=11WRIhQM7LuUnQg1lAoZQoNvvBvYNN1maDgQS4djwJo,40
-cucu-1.3.13.dist-info/METADATA,sha256=-BJsZqK7AOpXZK6eQ6Qlh5psQCo3CmtM3l3R_3zHYvU,16722
-cucu-1.3.13.dist-info/RECORD,,
+cucu/steps/webserver_steps.py,sha256=i11xOmSjhhrQ-2QrDfpjDhWroeJuuGKvbYEsHV1cioI,1406
+cucu/utils.py,sha256=hkvfTpN9bCClZ8ezny8mkAPq0OaR3A3kJi8lzq0zL0Q,10164
+cucu-1.3.15.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+cucu-1.3.15.dist-info/entry_points.txt,sha256=11WRIhQM7LuUnQg1lAoZQoNvvBvYNN1maDgQS4djwJo,40
+cucu-1.3.15.dist-info/METADATA,sha256=VH6FZBTbcc29w_3Rh27ROd7qvLDHvnt9clbzRqmU2lg,16722
+cucu-1.3.15.dist-info/RECORD,,