cucu 1.0.2__tar.gz → 1.0.7__tar.gz

{cucu-1.0.2 → cucu-1.0.7}/.circleci/config.yml

@@ -51,9 +51,14 @@ jobs:
         default: "chrome"
     docker:
       - image: cimg/python:3.12
-      - image: selenium/standalone-<<parameters.browser>>:124.0
         environment:
+          # Starting with python 3.12 coverage could be 2x slower so use experimental COVERAGE_CORE=sysmon
+          COVERAGE_CORE: sysmon
+      - image: selenium/standalone-<<parameters.browser>>:125.0
+        environment:
+          SE_ENABLE_TRACING: false
           SE_NODE_MAX_SESSIONS: 12
+          SE_NODE_OVERRIDE_MAX_SESSIONS: true
           SE_NODE_SESSION_TIMEOUT: 300
           SCREEN_WIDTH: 1366
           SCREEN_HEIGHT: 768
@@ -77,7 +82,7 @@ jobs:
           command: curl --retry 60 --retry-delay 5 --retry-connrefused http://localhost:4444
       - run:
           name: run_functional_tests
-          command: uv run cucu run features --workers 6 --selenium-remote-url http://localhost:4444 --generate-report --junit junit_results --browser "<<parameters.browser>>"
+          command: uv run cucu run features --workers 8 --selenium-remote-url http://localhost:4444 --generate-report --junit junit_results --browser "<<parameters.browser>>"
           environment:
             COVERAGE_PROCESS_START: pyproject.toml  # set to config file
       - run:
@@ -125,12 +130,14 @@ orbs:
           - run:
               name: Install uv
               command: |
+                echo 'export UV_INSTALL_DIR=$HOME/.uv' >> $BASH_ENV
+                source $BASH_ENV
                 curl -LsSf https://astral.sh/uv/install.sh | sh
-                echo 'source $HOME/.cargo/env' >> $BASH_ENV
+                echo 'source $UV_INSTALL_DIR/env' >> $BASH_ENV
                 source $BASH_ENV
           - save_cache:
               paths:
-                - $HOME/.cargo/env
+                - $UV_INSTALL_DIR/env
               key: v1-uv-cache-{{ checksum "uv.lock" }}
           - run:
               name: Verify uv installation

{cucu-1.0.2 → cucu-1.0.7}/.github/workflows/build.yml

@@ -70,7 +70,7 @@ jobs:
       pull-requests: write
     services:
       webserver:
-        image: selenium/standalone-${{ matrix.browser }}:124.0
+        image: selenium/standalone-${{ matrix.browser }}:125.0
         ports:
           - 4444:4444
         options: --shm-size=4gb

{cucu-1.0.2 → cucu-1.0.7}/CHANGELOG.md

@@ -5,62 +5,82 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project closely adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.7
+- Fix - stablize CI runs (increase workers, add envvar tweaks)
+- Fix - parse --workers correctly
+- Fix - Ctrl-C to terminate for multi-workers
+- Fix - ensure testing webserver is online
+- Change - use fork when not MacOS for multi-worker
+- Chore - bump jellyfish to 1.1.3
+
+## 1.0.6
+- Chore - relax required versions for requests library
+
+## 1.0.5
+- Fix - Resolved issues with the drag-and-drop feature to ensure compatibility with all input options.
+
+## 1.0.4
+- Change - for retry steps, also log before and after call messages
+
+## 1.0.3
+- Add - functional test for drag and drop file functionality
+
 ## 1.0.2
-- chore - fix logo for pypi
+- Chore - fix logo for pypi
 
 ## 1.0.1
-- chore - fix pyproject.toml authors and urls
-- change - add pre-commit to makefile
+- Chore - fix pyproject.toml authors and urls
+- Change - add pre-commit to makefile
 
 ## 1.0.0
-- change to 1.0.0!
-- chore - fix GH workflow for test publish
+- Change to 1.0.0!
+- Chore - fix GH workflow for test publish
 
 ## 0.207.0
-- chore - prep for publish - p2
-- replace poetry with uv
-- set default local python to 3.12
-- run pre-commit with uv
-- fix isort with ruff
+- Chore - prep for publish - p2
+- Replace poetry with uv
+- Set default local python to 3.12
+- Run pre-commit with uv
+- Fix isort with ruff
 
 ## 0.206.0
-- chore - prep for publish
-- replace black with ruff
-- remove detect-secrets to be replaced by GH repo security
-- remove bandit to be replaced by GH CodeQL
-- cleanup makefile
+- Chore - prep for publish
+- Replace black with ruff
+- Remove detect-secrets to be replaced by GH repo security
+- Remove bandit to be replaced by GH CodeQL
+- Cleanup makefile
 
 ## 0.205.0
-- change - increase information logged for failing before_scenario_hooks
+- Change - increase information logged for failing before_scenario_hooks
 
 ## 0.204.0
-- chore - add gh workflows for publishing
-- chore - fix project metadata
+- Chore - add gh workflows for publishing
+- Chore - fix project metadata
 
 ## 0.203.0
-- chore - move repo GH org locations
-- chore - remove sonarqube
+- Chore - move repo GH org locations
+- Chore - remove sonarqube
 
 ## 0.202.0
-- add - wait step to saving values from any table cells to a variable
+- Add - wait step to saving values from any table cells to a variable
 
 ## 0.201.0
-- change - add report path to the JUnit files when available
+- Change - add report path to the JUnit files when available
 
 ## 0.200.0
-- change - increase the log level of scheduling a feature file
+- Change - increase the log level of scheduling a feature file
 
 ## 0.199.0
-- chore - remove deprecated CI
-- chore - add PR template
+- Chore - remove deprecated CI
+- Chore - add PR template
 
 ## 0.198.0
-- chore - add sonarqube
-- chore - refactor circle config (config-drive executor, embed commands, move workflows up)
-- chore - configure renovate
-- chore - remove dependabot config (duplicates renovate)
-- chore - remove safety (duplicates sonarqube)
-- change - swap pebble for mpire, kill procs on run timeout
+- Chore - add sonarqube
+- Chore - refactor circle config (config-drive executor, embed commands, move workflows up)
+- Chore - configure renovate
+- Chore - remove dependabot config (duplicates renovate)
+- Chore - remove safety (duplicates sonarqube)
+- Change - swap pebble for mpire, kill procs on run timeout
 
 ## 0.197.0
 - Fix - before all hooks are now executed

{cucu-1.0.2 → cucu-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: cucu
-Version: 1.0.2
+Version: 1.0.7
 Summary: Easy BDD web testing
 Project-URL: Homepage, https://github.com/dominodatalab/cucu
 Project-URL: Download, https://pypi.org/project/cucu/
@@ -34,14 +34,14 @@ Requires-Dist: geckodriver-autoinstaller~=0.1.0
 Requires-Dist: humanize~=4.8.0
 Requires-Dist: importlib-metadata~=8.0.0
 Requires-Dist: ipdb~=0.13.13
-Requires-Dist: jellyfish~=1.0.1
+Requires-Dist: jellyfish~=1.1.3
 Requires-Dist: jinja2~=3.1.3
 Requires-Dist: lsprotocol~=2023.0.1
 Requires-Dist: mpire~=2.10.2
 Requires-Dist: psutil~=6.0.0
 Requires-Dist: pygls~=1.3.1
 Requires-Dist: pyyaml~=6.0.1
-Requires-Dist: requests~=2.31.0
+Requires-Dist: requests<3.0.0,>=2.31.0
 Requires-Dist: selenium~=4.15
 Requires-Dist: tabulate~=0.9.0
 Requires-Dist: tenacity~=9.0.0

cucu-1.0.7/data/www/drag_drop.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Drag and Drop File Upload Test with Validation</title>
+    <style>
+        #drop-zone {
+            width: 500px;
+            height: 100px;
+            border: 2px dashed #0088cc;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin: 20px auto;
+            font-family: Arial, sans-serif;
+            color: #0088cc;
+            background-color: #f9f9f9;
+        }
+        #drop-zone.hover {
+            background-color: #f0f0f0;
+        }
+        #message {
+            text-align: center;
+            margin-top: 20px;
+            font-family: Arial, sans-serif;
+            color: #ff0000;
+        }
+    </style>
+</head>
+<body>
+
+    <h2>Drag and Drop File Upload Test</h2>
+
+    <!-- Drag and Drop Zone -->
+    <div id="drop-zone">
+        Click or drag file to this area to upload
+    </div>
+
+    <input type="file" id="myFile" style="display: none;">
+
+    <!-- Validation Message Area -->
+    <div id="message"></div>
+
+    <script>
+        const dropZone = document.getElementById('drop-zone');
+        const fileInput = document.getElementById('myFile');
+        const messageDiv = document.getElementById('message');
+
+        // Function to display validation messages
+        function showMessage(message, isError = false) {
+            messageDiv.textContent = message;
+            messageDiv.style.color = isError ? '#ff0000' : '#008000'; // Red for errors, green for success
+        }
+
+        // Trigger file input click when the drop zone is clicked
+        dropZone.addEventListener('click', function() {
+            fileInput.click();
+        });
+
+        // Handle drag over
+        dropZone.addEventListener('dragover', function(e) {
+            e.preventDefault();
+            dropZone.classList.add('hover');
+        });
+
+        // Handle drag leave
+        dropZone.addEventListener('dragleave', function() {
+            dropZone.classList.remove('hover');
+        });
+
+        // Handle file drop
+        dropZone.addEventListener('drop', function(e) {
+            e.preventDefault();
+            dropZone.classList.remove('hover');
+            const files = e.dataTransfer.files;
+
+            if (files.length > 0) {
+                showMessage(`File dropped: ${files[0].name}`, false);
+                fileInput.files = files;
+                }
+            else {
+                showMessage('No file was dropped.', true);
+            }
+        });
+    </script>
+
+</body>
+</html>

{cucu-1.0.2 → cucu-1.0.7}/features/browser/file_upload.feature

@@ -9,3 +9,9 @@ Feature: File upload
       And I click the button "upload!"
       And I save the current url to the variable "URL"
      Then I should see "{URL}" matches ".*\?filename=file_upload.feature"
+
+  Scenario: User can drag and drop to upload a file
+    Given I start a webserver at directory "data/www" and save the port to the variable "PORT"
+      And I open a browser at the url "http://{HOST_ADDRESS}:{PORT}/drag_drop.html"
+     When I wait to drag and drop the file "features/browser/file_upload.feature" to "Click or drag file to this area to upload"
+     Then I wait to see the text "File dropped: file_upload.feature"

{cucu-1.0.2 → cucu-1.0.7}/features/cli/report_basics.feature

@@ -204,7 +204,7 @@ Feature: Report basics
   @runtime-timeout
   Scenario: User can run with a runtime timeout and still produce a valid report
     Given I run the command "cucu run data/features/slow_features --runtime-timeout 9 --results {CUCU_RESULTS_DIR}/runtime_timeout_reporting_results" and expect exit code "1"
-     Then I should see the previous step took less than "13" seconds
+     Then I should see the previous step took less than "14" seconds
      When I run the command "cucu report {CUCU_RESULTS_DIR}/runtime_timeout_reporting_results --output {CUCU_RESULTS_DIR}/runtime_timeout_reporting_report" and expect exit code "0"
       And I start a webserver at directory "{CUCU_RESULTS_DIR}/runtime_timeout_reporting_report/" and save the port to the variable "PORT"
       And I open a browser at the url "http://{HOST_ADDRESS}:{PORT}/index.html"

{cucu-1.0.2 → cucu-1.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cucu"
-version = "1.0.2"
+version = "1.0.7"
 description = "Easy BDD web testing"
 readme = "README.md"
 license = { text = "The Clear BSD License" }
@@ -51,14 +51,14 @@ dependencies = [
     "humanize~=4.8.0",
     "importlib-metadata~=8.0.0",
     "ipdb~=0.13.13",
-    "jellyfish~=1.0.1",
+    "jellyfish~=1.1.3",
     "jinja2~=3.1.3",
     "lsprotocol~=2023.0.1",
     "mpire~=2.10.2",
     "psutil~=6.0.0",
     "pygls~=1.3.1",
     "pyyaml~=6.0.1",
-    "requests~=2.31.0",
+    "requests>=2.31.0,<3.0.0",
     "selenium~=4.15",
     "tabulate~=0.9.0",
     "tenacity~=9.0.0",

{cucu-1.0.2 → cucu-1.0.7}/src/cucu/cli/core.py

@@ -4,6 +4,7 @@ import json
 import os
 import shutil
 import signal
+import sys
 import time
 import xml.etree.ElementTree as ET
 from importlib.metadata import version
@@ -189,6 +190,7 @@ def main():
     "--workers",
     default=None,
     help="Specifies the number of workers to use to run tests in parallel",
+    type=int,
 )
 @click.option(
     "--verbose/--no-verbose",
@@ -338,11 +340,20 @@ def run(
             if os.path.isdir(filepath):
                 basepath = os.path.join(filepath, "**/*.feature")
                 feature_filepaths = list(glob.iglob(basepath, recursive=True))
-
             else:
                 feature_filepaths = [filepath]
 
-            with WorkerPool(n_jobs=int(workers), start_method="spawn") as pool:
+            if sys.platform == "darwin":
+                logger.info(
+                    "MAC OS detected, using 'forkserver' start method since 'fork' is unstable"
+                )
+                start_method = "forkserver"
+            else:
+                start_method = "fork"
+
+            with WorkerPool(
+                n_jobs=int(workers), start_method=start_method
+            ) as pool:
                 # Each feature file is applied to the pool as an async task.
                 # It then polls the async result of each task. It the result
                 # is ready, it removes the result from the list of results that
@@ -364,6 +375,34 @@ def run(
                     timer = Timer(runtime_timeout, runtime_exit)
                     timer.start()
 
+                def kill_workers():
+                    for worker in pool._workers:
+                        try:
+                            worker_proc = psutil.Process(worker.pid)
+                            for child in worker_proc.children():
+                                child.kill()
+
+                            worker_proc.kill()
+                        except psutil.NoSuchProcess:
+                            pass
+
+                def handle_kill_signal(signum, frame):
+                    signal.signal(
+                        signum, signal.SIG_IGN
+                    )  # ignore additional signals
+                    logger.warn(
+                        f"received signal {signum}, sending kill signal to workers"
+                    )
+                    kill_workers()
+                    if timer:
+                        timer.cancel()
+
+                    os.kill(os.getpid(), signal.SIGINT)
+
+                # This is for local runs where you want to cancel the run with a ctrl+c or SIGTERM
+                signal.signal(signal.SIGINT, handle_kill_signal)
+                signal.signal(signal.SIGTERM, handle_kill_signal)
+
                 async_results = {}
                 for feature_filepath in feature_filepaths:
                     async_results[feature_filepath] = pool.apply_async(
@@ -430,15 +469,7 @@ def run(
 
                 if timeout_reached:
                     logger.warn("Timeout reached, send kill signal to workers")
-                    for worker in pool._workers:
-                        try:
-                            worker_proc = psutil.Process(worker.pid)
-                            for child in worker_proc.children():
-                                child.kill()
-
-                            worker_proc.kill()
-                        except psutil.NoSuchProcess:
-                            pass
+                    kill_workers()
 
                 task_failed.update(async_results)
 

cucu-1.0.7/src/cucu/steps/file_input_steps.py

@@ -0,0 +1,184 @@
+import os
+
+import humanize
+
+from cucu import fuzzy, logger, retry, step
+from cucu.utils import take_saw_element_screenshot
+
+
+def find_file_input(ctx, name, index=0):
+    """
+
+        * <input type="file">
+
+    parameters:
+      ctx(object): behave context object used to share data between steps
+      name(str):   name that identifies the desired button on screen
+      index(str):  the index of the button if there are duplicates
+
+    returns:
+        the WebElement that matches the provided arguments.
+    """
+    ctx.check_browser_initialized()
+    element = fuzzy.find(
+        ctx.browser, name, ['input[type="file"]'], index=index
+    )
+
+    prefix = "" if index == 0 else f"{humanize.ordinal(index)} "
+
+    take_saw_element_screenshot(ctx, "file input", name, index, element)
+
+    if element is None:
+        raise RuntimeError(f'unable to find the {prefix}file input "{name}"')
+
+    return element
+
+
+@step('I upload the file "{filepath}" to the file input "{name}"')
+def upload_file_to_input(ctx, filepath, name):
+    _input = find_file_input(ctx, name)
+    _input.send_keys(os.path.abspath(filepath))
+
+
+JS_DROP_FILE = """
+    var args = arguments,
+    element = args[0],
+    offsetX = args[1],
+    offsetY = args[2],
+    doc = element.ownerDocument || document;
+
+    var box = element.getBoundingClientRect(),
+        clientX = box.left + (offsetX || box.width / 2),
+        clientY = box.top + (offsetY || box.height / 2),
+        target = doc.elementFromPoint(clientX, clientY);
+    if (!(target && element.contains(target))) {
+        element.scrollIntoView({
+            behavior: "instant",
+            block: "center",
+            inline: "center",
+        });
+        var box = element.getBoundingClientRect(),
+            clientX = box.left + (offsetX || box.width / 2),
+            clientY = box.top + (offsetY || box.height / 2),
+            target = doc.elementFromPoint(clientX, clientY);
+
+        if (!(target && element.contains(target))) {
+            // Scrolling didn't do the trick, so give up
+            var ex = new Error("Element not interactable");
+            ex.code = 15;
+            throw ex;
+        }
+    }
+
+    var input = doc.createElement("INPUT");
+    input.setAttribute("type", "file");
+    input.setAttribute("multiple", "");
+    input.setAttribute("style", "position:fixed;z-index:2147483647;left:0;top:0;");
+    input.onchange = function (ev) {
+    input.parentElement.removeChild(input);
+    ev.stopPropagation();
+
+    var dataTransfer = {
+        constructor: DataTransfer,
+        effectAllowed: "all",
+        dropEffect: "none",
+        types: ["Files"],
+        files: input.files,
+        setData: function setData() {},
+        getData: function getData() {},
+        clearData: function clearData() {},
+        setDragImage: function setDragImage() {},
+    };
+
+    if (window.DataTransferItemList) {
+        dataTransfer.items = Object.setPrototypeOf(
+        Array.prototype.map.call(input.files, function (f) {
+            return {
+            constructor: DataTransferItem,
+            kind: "file",
+            type: f.type,
+            getAsFile: function getAsFile() {
+                return f;
+            },
+            getAsString: function getAsString(callback) {
+                var reader = new FileReader();
+                reader.onload = function (ev) {
+                callback(ev.target.result);
+                };
+                reader.readAsText(f);
+            },
+            webkitGetAsEntry: function webkitGetAsEntry() {
+                return {
+                constructor: window.FileSystemEntry || window.Entry,
+                name: f.name,
+                fullPath: "/" + f.name,
+                isFile: true,
+                isDirectory: false,
+                file: function file(callback) {
+                    callback(f);
+                },
+                };
+            },
+            };
+        }),
+        {
+            constructor: DataTransferItemList,
+            add: function add() {},
+            clear: function clear() {},
+            remove: function remove() {},
+        }
+        );
+    }
+
+    ["dragenter", "dragover", "drop"].forEach(function (type) {
+        var event = doc.createEvent("DragEvent");
+        event.initMouseEvent(
+        type,
+        true,
+        true,
+        doc.defaultView,
+        0,
+        0,
+        0,
+        clientX,
+        clientY,
+        false,
+        false,
+        false,
+        false,
+        0,
+        null
+        );
+
+        Object.setPrototypeOf(event, null);
+        event.dataTransfer = dataTransfer;
+        Object.setPrototypeOf(event, DragEvent.prototype);
+
+        target.dispatchEvent(event);
+    });
+    };
+
+    doc.documentElement.appendChild(input);
+    input.getBoundingClientRect(); /* force reflow for Firefox */
+    return input;
+"""
+
+
+def drag_and_drop_file(ctx, name, filepath):
+    drop_target = fuzzy.find(ctx.browser, name, ["*"])
+    drop_target_html = drop_target.get_attribute("outerHTML")
+    logger.debug(
+        f'looked for drag & drop target "{name}" and found "{drop_target_html}"'
+    )
+    file_input = ctx.browser.execute(JS_DROP_FILE, drop_target, 0, 0)
+    file_input.send_keys(os.path.abspath(filepath))
+
+
+@step('I drag and drop the file "{filepath}" to "{name}"')
+def should_drag_and_drop_file(ctx, filepath, name):
+    drag_and_drop_file(ctx, name, filepath)
+
+
+@step('I wait to drag and drop the file "{filepath}" to "{name}"')
+def wait_to_drag_and_drop_file(ctx, filepath, name):
+    retry(drag_and_drop_file)(ctx, name, filepath)

{cucu-1.0.2 → cucu-1.0.7}/src/cucu/steps/webserver_steps.py

@@ -1,10 +1,11 @@
+import socket
 from functools import partial
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from threading import Thread
 
 from behave import step
 
-from cucu import register_after_this_scenario_hook
+from cucu import logger, register_after_this_scenario_hook
 from cucu.config import CONFIG
 
 
@@ -33,6 +34,9 @@ def run_webserver_for_scenario(ctx, directory, variable):
     _, port = httpd.server_address
     CONFIG[variable] = str(port)
 
+    with socket.create_connection(("localhost", port), timeout=5):
+        logger.debug(f"Webserver is running at {port=}port")
+
     def shutdown_webserver(_):
         httpd.shutdown()
         thread.join()

{cucu-1.0.2 → cucu-1.0.7}/src/cucu/utils.py

@@ -11,6 +11,8 @@ import shutil
 import humanize
 from tabulate import DataRow, TableFormat, tabulate
 from tenacity import (
+    after_log,
+    before_log,
     before_sleep_log,
     retry_if_not_exception_type,
     stop_after_delay,
@@ -119,6 +121,8 @@ def retry(func, wait_up_to_s=None, retry_after_s=None):
         stop=stop_after_delay(wait_up_to_s),
         wait=wait_fixed(retry_after_s),
         retry=retry_if_not_exception_type(StopRetryException),
+        before=before_log(logger, logging.DEBUG),
+        after=after_log(logger, logging.DEBUG),
         before_sleep=before_sleep_log(logger, logging.DEBUG),
     )
     def new_decorator(*args, **kwargs):