cucu 1.3.17__tar.gz → 1.3.19__tar.gz

{cucu-1.3.17 → cucu-1.3.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cucu
-Version: 1.3.17
+Version: 1.3.19
 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.17 → cucu-1.3.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cucu"
-version = "1.3.17"
+version = "1.3.19"
 description = "Easy BDD web testing"
 readme = "README.md"
 license = { text = "The Clear BSD License" }

{cucu-1.3.17 → cucu-1.3.19}/src/cucu/reporter/html.py

@@ -234,6 +234,9 @@ def generate(results: Path, basepath: Path):
                             f'Exception while trying to run sub_headers hook for scenario: "{scenario_dict["name"]}"\n{traceback.format_exc()}'
                         )
                 scenario_dict["sub_headers"] = "<br/>".join(sub_headers)
+                scenario_dict["steps"] = sorted(
+                    scenario_dict["steps"], key=lambda x: x["seq"]
+                )
 
                 for step_dict in scenario_dict["steps"]:
                     # Handle section headings with different levels (# to ####)

{cucu-1.3.17 → cucu-1.3.19}/src/cucu/reporter/templates/scenario.html

@@ -152,7 +152,7 @@
                         {% for image in step['screenshots'] %}
                             <img class="mx-auto d-block img-fluid shadow bg-white rounded" id="{{ image['html_id'] }}" style="margin-bottom:15px" alt="{{ escape(image['label']) }}" title="{{ escape(image['label']) }}" src="{{ image['html_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>
+                            <div class="step-image-highlight" id="{{ image['html_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>

{cucu-1.3.17 → cucu-1.3.19}/src/cucu/steps/browser_steps.py

@@ -1,5 +1,6 @@
 import base64
 import os
+import re
 
 from selenium.webdriver.common.keys import Keys
 
@@ -81,6 +82,23 @@ def wait_to_see_the_current_url_is(ctx, value):
     retry(assert_url_is)(ctx, value)
 
 
+def assert_url_matches(ctx, regex):
+    ctx.check_browser_initialized()
+    url = ctx.browser.get_current_url()
+    if not re.search(regex, url):
+        raise RuntimeError(f"current url {url} does not match {regex}")
+
+
+@step('I should see the current url matches "{regex}"')
+def should_see_the_current_url_matches(ctx, regex):
+    assert_url_matches(ctx, regex)
+
+
+@step('I wait to see the current url matches "{regex}"')
+def wait_to_see_the_current_url_matches(ctx, regex):
+    retry(assert_url_matches)(ctx, regex)
+
+
 @step('I save the current url to the variable "{variable}"')
 def save_current_url_to_variable(ctx, variable):
     ctx.check_browser_initialized()