pytest-api-framework-alpha 0.1.2__tar.gz → 0.1.3__tar.gz

{pytest_api_framework_alpha-0.1.2 → pytest_api_framework_alpha-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-api-framework-alpha
-Version: 0.1.2
+Version: 0.1.3
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

{pytest_api_framework_alpha-0.1.2 → pytest_api_framework_alpha-0.1.3}/framework/render_data.py

@@ -5,6 +5,7 @@ import traceback
 
 import allure
 import pytest
+from box import Box
 from faker import Faker
 from framework.exit_code import ExitCode
 from framework.utils.log_util import logger
@@ -31,7 +32,7 @@ class RenderData(object):
     def __init__(self, data):
         self.data = data
         self.request = data.get("request")
-        self.scenario = data.get("_scenario").get("data")
+        self.scenario = Box(data.get("_scenario").get("data"))
         self.context = CONTEXT
         self.faker = SingletonFaker(locale=FAKER_LANGUAGE).faker
         self._is_multipart = False
@@ -42,39 +43,11 @@ class RenderData(object):
         :return:
         """
         with allure.step("渲染数据"):
-            if self.scenario:
-                self.request = self.replace_variables_recursive(self.request, self.scenario)
             self.replace_attribute(self.request)
         self.data["request"] = self.request
         self.data["_is_multipart"] = self._is_multipart
         return self.data
 
-    def replace_variables_recursive(self, data, params):
-        """
-        递归遍历 data 并用 params[key] 替换 ${key} 变量，保持数据类型
-        """
-
-        if isinstance(data, dict):  # 处理字典
-            new_dict = {}
-            for key, value in data.items():
-                new_dict[key] = self.replace_variables_recursive(value, params)  # 递归处理
-            return new_dict
-
-        elif isinstance(data, list):  # 处理列表
-            return [self.replace_variables_recursive(item, params) for item in data]
-
-        elif isinstance(data, str) and data.startswith("${") and data.endswith("}"):
-            # 仅当字符串是完整的 "${key}" 格式时才替换
-            key = data[2:-1]  # 提取 key 名称
-            if key in params.keys():
-                value = params[key]
-                logger.info(f"前置读取变量: {key}: {value}")
-                return value  # 直接赋值（不存在则返回原值）
-            return data
-
-        else:  # 其他类型（int, float, bool, None）直接返回
-            return data
-
     def replace_attribute(self, data):
         pattern = re.compile(r"\$\{([\w.\[\]0-9]+(?:\(\w*(?:,\w*)*\))?)}")
         file_path_pattern = re.compile(
@@ -137,13 +110,15 @@ class RenderData(object):
             new_expression = f"{belong_app}.{expression}"
         else:
             new_expression = expression
-        value = self.get_nested_value(self.context, expression) or self.get_nested_value(self.context, new_expression)
 
-        if not value:
-            logger.warning(f"未从CONTEXT中获取到对应变量{expression}")
-            # pytest.exit(ExitCode.GLOBAL_ATTRIBUTE_NOT_EXIST)
+        value = (
+            self.get_nested_value(self.scenario, expression)
+            if self.get_nested_value(self.scenario, expression) is not None else
+            self.get_nested_value(self.context, new_expression)
+            if self.get_nested_value(self.context, new_expression) is not None else
+            self.get_nested_value(self.context, expression)
+        )
 
-            return None
         with allure.step(f"{expression}: {value}"):
             logger.info(f"前置读取变量: {expression}: {value}")
             return value
@@ -171,28 +146,6 @@ class RenderData(object):
                 logger.info(f"前置读取函数: {keyword}: {value}")
                 return value
 
-    def get_file_obj(self, data, pattern):
-        # 如果 data 是字典，则遍历每一个键值对
-        if isinstance(data, dict):
-            for key, value in data.items():
-                # 递归调用处理值
-                data[key] = self.get_file_obj(value, pattern)
-
-        # 如果 data 是列表，则遍历每一个元素
-        elif isinstance(data, list):
-            for index in range(len(data)):
-                # 递归调用处理列表中的每一个元素
-                data[index] = self.get_file_obj(data[index], pattern)
-
-        # 如果 data 是字符串，则检查是否匹配正则表达式
-        elif isinstance(data, str):
-            if re.fullmatch(pattern, data):
-                # 如果匹配，则替换为文件流
-                self._is_multipart = True
-                return self.open_file_for_multipart(data)
-        # 返回处理后的数据
-        return data
-
     @staticmethod
     def get_nested_value(obj, attr_path):
         """通过字符串路径（如 'a.b[0].c'）获取嵌套属性值"""

{pytest_api_framework_alpha-0.1.2 → pytest_api_framework_alpha-0.1.3}/framework/startapp.py

@@ -52,7 +52,7 @@ class TestUntitled(BaseTestCase):
 
     def test_untitled(self):
         # 发送请求
-        self.request(app="{app}", account="user", data=self.data)
+        self.request(app="{app}", account="admin", data=self.data)
         # 断言
         assert self.response.status_code == 200
         assert len(self.response.jsonpath("$.data.balances")) > 0"""
@@ -67,7 +67,17 @@ def create_test_data(app):
         yaml.dump({
             "case_common": {
                 "module": "功能模块名称",
-                "describe": "测试场景描述"
+                "describe": "测试场景描述",
+                "scenarios": [
+                    {
+                        "scenario": {
+                            "data": {
+                                "tag_id": 4,
+                                "user_id": 1
+                            }
+                        }
+                    }
+                ]
             },
             "test_untitled": {
                 "title": "登录成功",
@@ -76,7 +86,8 @@ def create_test_data(app):
                     "url": "/login",
                     "method": "post",
                     "json": {
-                        "name": "Jerry"
+                        "name": "Jerry",
+                        "user_id": "${user_id}"
                     }
                 },
                 "extract": [

{pytest_api_framework_alpha-0.1.2 → pytest_api_framework_alpha-0.1.3}/pytest_api_framework_alpha.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-api-framework-alpha
-Version: 0.1.2
+Version: 0.1.3
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

{pytest_api_framework_alpha-0.1.2 → pytest_api_framework_alpha-0.1.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pytest-api-framework-alpha",  # 包名（必须唯一）
-    version="0.1.2",
+    version="0.1.3",
     packages=find_packages(),
     author="alpha",
     author_email="",