cucu 1.0.4__py3-none-any.whl → 1.0.7__py3-none-any.whl

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/steps/file_input_steps.py

@@ -41,30 +41,125 @@ def upload_file_to_input(ctx, filepath, name):
 
 
 JS_DROP_FILE = """
-    var target = arguments[0],
-        offsetX = arguments[1],
-        offsetY = arguments[2],
-        document = target.ownerDocument || document,
-        window = document.defaultView || window;
-
-    var input = document.createElement('INPUT');
-    input.type = 'file';
-    input.onchange = function () {
-      var rect = target.getBoundingClientRect(),
-          x = rect.left + (offsetX || (rect.width >> 1)),
-          y = rect.top + (offsetY || (rect.height >> 1)),
-          dataTransfer = { files: this.files };
-
-      ['dragenter', 'dragover', 'drop'].forEach(function (name) {
-        var evt = document.createEvent('MouseEvent');
-        evt.initMouseEvent(name, !0, !0, window, 0, 0, 0, x, y, !1, !1, !1, !1, 0, null);
-        evt.dataTransfer = dataTransfer;
-        target.dispatchEvent(evt);
-      });
-
-      setTimeout(function () { document.body.removeChild(input); }, 25);
+    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() {},
     };
-    document.body.appendChild(input);
+
+    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;
 """
 

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.4.dist-info → cucu-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: cucu
-Version: 1.0.4
+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.4.dist-info → cucu-1.0.7.dist-info}/RECORD

@@ -14,7 +14,7 @@ cucu/browser/frames.py,sha256=IW7kzRJn5PkbMaovIelAeCWO-T-2sOTwqaYBw-0-LKU,3545
 cucu/browser/selenium.py,sha256=c3B6IShD8Es-TGW-dxxNibGItJ4WEQI_xJpgc6uL6-E,11613
 cucu/browser/selenium_tweaks.py,sha256=oUIhWVhBZbc9qsmQUJMpIr9uUWKxtgZBcnySWU6Yttk,879
 cucu/cli/__init__.py,sha256=uXX5yVG1konJ_INdlrcfMg-Tt_5_cSx29Ed8R8v908A,62
-cucu/cli/core.py,sha256=OAdjT0_4I4sPCOgEssYW0ihKLu-z2vuses-H5MUQRgU,23089
+cucu/cli/core.py,sha256=qFEEmTrj2avKoyYtPqQjd-tgvHp8R21NCtP_pknwEos,24225
 cucu/cli/run.py,sha256=e2JR77YF-7YSC4nCjogPcIsfoH7T43dAz5x_eeeue6k,5906
 cucu/cli/steps.py,sha256=hxsLymlYvF0uqUkDVq3s6heABkYnRo_SdQCpBdpb0e0,4009
 cucu/cli/thread_dumper.py,sha256=Z3XnYSxidx6pqjlQ7zu-TKMIYZWk4z9c5YLdPkcemiU,1593
@@ -60,7 +60,7 @@ cucu/steps/command_steps.py,sha256=nVCc8-TEitetk-zhk4z1wa0owqLQyHeQVH5THioUw-k,5
 cucu/steps/comment_steps.py,sha256=KcU0Ya8XSjYEh8gdUGh0qsAxgB_Ru977E84yJaXrvz0,379
 cucu/steps/draggable_steps.py,sha256=lnQLicp0GZJaxD_Qm2P13ruUZAsl3mptwaI5-SQ6XJ0,4655
 cucu/steps/dropdown_steps.py,sha256=abykG--m79kDQ4LU1tm73fNLFPmrKDavyFzJb2MYCu0,15601
-cucu/steps/file_input_steps.py,sha256=U-glhJN62cBGZMsqhegoCVvqo_GLGQowVb9VO2WmQ98,2812
+cucu/steps/file_input_steps.py,sha256=LLMAozVpceLMD-kJOE-auKHAdWLbNprH8eCfVQuNoGg,5523
 cucu/steps/filesystem_steps.py,sha256=8l37A-yPxT4Mzdi1JNSTShZkwyFxgSwnh6C0V-hM_RA,4741
 cucu/steps/flow_control_steps.py,sha256=vlW0CsphVS9NvrOnpT8wSS2ngHmO3Z87H9siKIQwsAw,6365
 cucu/steps/image_steps.py,sha256=4X6bdumsIybcJBuao83TURxWAIshZyCvKi1uTJEoy1k,941
@@ -75,9 +75,9 @@ cucu/steps/table_steps.py,sha256=XB-NTwuue5LCXGlLZLex0QcRKOSrc4UA_F4Kj6l-J78,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=_bvqJxF8BSIIufNItZMSyjijEJEEPJbEvwnqPHoM9Tg,1259
-cucu-1.0.4.dist-info/METADATA,sha256=yLEP4pCBUrnEfeASyxMahBAy6SEX47S_hAt5HzkmPOk,16238
-cucu-1.0.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-cucu-1.0.4.dist-info/entry_points.txt,sha256=YEXTyEfIZbcV0GJ9R3Gfu3j6DcOJJK7_XHkJqE3Yiao,39
-cucu-1.0.4.dist-info/licenses/LICENSE,sha256=WfgJYF9EaQoL_OeWr2Qd0MxhhFegDfzWSUmvDTwFxis,1721
-cucu-1.0.4.dist-info/RECORD,,
+cucu/steps/webserver_steps.py,sha256=wWkpSvcSMdiskPkh4cqlepWx1nkvEpTU2tRXQmPDbyo,1410
+cucu-1.0.7.dist-info/METADATA,sha256=EGuVc5vJmj6BjOYIEwPQByWkoXhr1ip91MbnPcVzAZk,16245
+cucu-1.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cucu-1.0.7.dist-info/entry_points.txt,sha256=YEXTyEfIZbcV0GJ9R3Gfu3j6DcOJJK7_XHkJqE3Yiao,39
+cucu-1.0.7.dist-info/licenses/LICENSE,sha256=WfgJYF9EaQoL_OeWr2Qd0MxhhFegDfzWSUmvDTwFxis,1721
+cucu-1.0.7.dist-info/RECORD,,

{cucu-1.0.4.dist-info → cucu-1.0.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any