sefrone-api-e2e 1.2.6__tar.gz → 1.2.7__tar.gz

{sefrone_api_e2e-1.2.6 → sefrone_api_e2e-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sefrone_api_e2e
-Version: 1.2.6
+Version: 1.2.7
 Summary: A Python package to provide e2e testing helpers for sefrone API projects
 Home-page: https://bitbucket.org/sefrone/sefrone_pypi
 Author: Sefrone

{sefrone_api_e2e-1.2.6 → sefrone_api_e2e-1.2.7}/sefrone_api_e2e/e2e/Scenarios/Auth/1_normal_auth_flow.yaml

@@ -221,40 +221,6 @@ steps:
       - "{{body.response.linkedWorkspaces.count()}} == 1"
       - "{{body.response.linkedWorkspaces[0].workspaceName}} == '$var(DEFAULT_WORKSPACE_NAME)'"
 
-  - name: "Register standard account"
-    skip_if:
-      - "PseudoRegister not in {$stored.0_check_features.enabled_features}"
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)"
-    send_as: "json"
-    body:
-      username: "e2e_new_user_{$stored.seed_id}"
-      password: "e2e_test_password"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-        response:
-          accountId: string
-          projectId: string
-          project: string
-          accountType: string
-          credentialType: string
-          isActive: boolean
-          username: string
-          linkedWorkspaces: []
-    save:
-      registered_account_id: "{{body.response.accountId}}"
-      registered_username: "{{body.response.username}}"
-    assertions:
-      - "{{body.response.accountType}} == 'standard'"
-      - "{{body.response.credentialType}} == 'standard'"
-      - "{{body.response.isActive}} == True"
-      - "{{body.response.linkedWorkspaces.count()}} == 0"
-      - "{{body.response.username}} include 'e2e_new_user_'"
-
   - name: "Login with wrong password"
     method: "POST"
     endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"

{sefrone_api_e2e-1.2.6 → sefrone_api_e2e-1.2.7}/sefrone_api_e2e/runner_rest_api.py

@@ -1,6 +1,7 @@
 import hashlib
 import os
 import random
+import re
 import secrets
 import time
 from typing import Any
@@ -256,13 +257,18 @@ class RestApiRunner(StepRunner):
                         )
 
         # --- JSON parsing ---
+        # Best-effort: a non-JSON/empty body (e.g. a redirect response) is only fatal if
+        # the step actually needs the parsed body (`expect.body`). Steps that only need
+        # `{{headers.*}}` (assertions/save) must still work when the body isn't JSON.
         needs_json = "body" in expect or "assertions" in step or "save" in step
         resp_json = None
         if needs_json:
             try:
                 resp_json = resp.json()
             except Exception:
-                raise AssertionError(f"Response is not valid JSON: {resp.text}")
+                if "body" in expect:
+                    raise AssertionError(f"Response is not valid JSON: {resp.text}")
+                resp_json = None
 
         # --- Content-Type assertion ---
         expected_content_type = expect.get("content_type")
@@ -295,32 +301,56 @@ class RestApiRunner(StepRunner):
         if "save_file_sha256" in step:
             ctx.store_value(step["save_file_sha256"], hashlib.sha256(resp.content).hexdigest())
 
+        # `{{headers.*}}` is always available (even on non-JSON/redirect responses);
+        # `{{body.*}}` is only available when the response was valid JSON.
+        template_context: dict[str, Any] = {"headers": dict(resp.headers)}
         if resp_json is not None:
-            if "body" in expect:
-                if ctx.is_verbose:
-                    print(f"Response body: {resp_json}")
-                ctx.validate_structure(resp_json, expect["body"])
-
-            if "assertions" in step:
-                for expr in step["assertions"]:
-                    try:
-                        expr = ctx.substitute_stored(expr)
-                        rendered = ctx.render_template(expr, {"body": resp_json}, add_quotes=True)
-                        ctx.try_eval(rendered, expr)
-                    except Exception as e:
-                        raise AssertionError(
-                            f"Assertion failed for expression\n    -->'{expr}'\n    -->{e}\n    -->{resp.text}"
-                        )
-
-            if "save" in step:
-                for key, path_expr in step["save"].items():
-                    try:
-                        path_expr = ctx.substitute_stored(str(path_expr))
-                        rendered = ctx.render_template(path_expr, {"body": resp_json})
+            template_context["body"] = resp_json
+
+        if "body" in expect:
+            if ctx.is_verbose:
+                print(f"Response body: {resp_json}")
+            ctx.validate_structure(resp_json, expect["body"])
+
+        if "assertions" in step:
+            for expr in step["assertions"]:
+                try:
+                    expr = ctx.substitute_stored(expr)
+                    rendered = ctx.render_template(expr, template_context, add_quotes=True)
+                    ctx.try_eval(rendered, expr)
+                except Exception as e:
+                    raise AssertionError(
+                        f"Assertion failed for expression\n    -->'{expr}'\n    -->{e}\n    -->{resp.text}"
+                    )
+
+        if "save" in step:
+            for key, path_expr in step["save"].items():
+                try:
+                    if isinstance(path_expr, dict) and "from" in path_expr and "regex" in path_expr:
+                        # Regex extraction mode — same shape as check_email's save:
+                        #   save:
+                        #     auth_code:
+                        #       from: "{{headers.Location}}"
+                        #       regex: "code=([^&]+)"
+                        source_tmpl = ctx.substitute_stored(str(path_expr["from"]))
+                        source = ctx.render_template(source_tmpl, template_context)
+                        m = re.search(path_expr["regex"], source)
+                        if m is None:
+                            raise AssertionError(
+                                f"Regex {path_expr['regex']!r} did not match. Source: {source!r}"
+                            )
+                        value = m.group(1) if m.lastindex else m.group(0)
+                        ctx.store_value(key, value)
+                    else:
+                        # Plain template mode
+                        rendered_path = ctx.substitute_stored(str(path_expr))
+                        rendered = ctx.render_template(rendered_path, template_context)
                         ctx.store_value(key, rendered)
-                    except Exception as e:
-                        raise AssertionError(
-                            f"Failed to render save path\n    -->'{path_expr}'\n    -->{e}\n    -->{resp.text}"
-                        )
+                except AssertionError:
+                    raise
+                except Exception as e:
+                    raise AssertionError(
+                        f"Failed to render save path\n    -->'{path_expr}'\n    -->{e}\n    -->{resp.text}"
+                    )
 
         return StepResult.passed()

{sefrone_api_e2e-1.2.6 → sefrone_api_e2e-1.2.7}/sefrone_api_e2e.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sefrone_api_e2e
-Version: 1.2.6
+Version: 1.2.7
 Summary: A Python package to provide e2e testing helpers for sefrone API projects
 Home-page: https://bitbucket.org/sefrone/sefrone_pypi
 Author: Sefrone

{sefrone_api_e2e-1.2.6 → sefrone_api_e2e-1.2.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="sefrone_api_e2e",
-    version="1.2.6",
+    version="1.2.7",
     author="Sefrone",
     author_email="contact@sefrone.com",
     description="A Python package to provide e2e testing helpers for sefrone API projects",