mangoautomation 1.0.48__py3-none-any.whl → 1.0.50__py3-none-any.whl

mangoautomation/models/__init__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Project: 芒果测试平台
-# @Description:
-# @Time   : 2023-09-09 23:17
+# @Description:# @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
 import sys
 

mangoautomation/models/_ui_model.py

@@ -45,8 +45,7 @@ class ElementResultModel(BaseModel):
     type: int
     ope_key: str | None = None
     ope_value: dict = {}
-    expect: str | None = None
-    actual: str | None = None
+    ass_msg: str | None = None
     sql: str | None = None
     key_list: str | None = None
     key: str | None = None

mangoautomation/uidrive/_async_element.py

@@ -146,20 +146,24 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0053)
         await self.__ope_value(True)
-        if self.drive_type == DriveTypeEnum.WEB.value:
-            await self.web_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        elif self.drive_type == DriveTypeEnum.ANDROID.value:
-            self.a_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        else:
-            pass
+        try:
+            if self.drive_type == DriveTypeEnum.WEB.value:
+                self.element_result_model.ass_msg = await self.web_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            elif self.drive_type == DriveTypeEnum.ANDROID.value:
+                self.element_result_model.ass_msg = self.a_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            else:
+                pass
+        except MangoAutomationError as error:
+            self.element_result_model.ass_msg = error.msg
+            raise MangoAutomationError(*ERROR_MSG_0054)
         self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
 
     async def __sql(self):

mangoautomation/uidrive/_sync_element.py

@@ -146,20 +146,24 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0053)
         self.__ope_value(True)
-        if self.drive_type == DriveTypeEnum.WEB.value:
-            self.web_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        elif self.drive_type == DriveTypeEnum.ANDROID.value:
-            self.a_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        else:
-            pass
+        try:
+            if self.drive_type == DriveTypeEnum.WEB.value:
+                self.element_result_model.ass_msg = self.web_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            elif self.drive_type == DriveTypeEnum.ANDROID.value:
+                self.element_result_model.ass_msg = self.a_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            else:
+                pass
+        except MangoAutomationError as error:
+            self.element_result_model.ass_msg = error.msg
+            raise MangoAutomationError(*ERROR_MSG_0054)
         self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
 
     def __sql(self):

mangoautomation/uidrive/android/__init__.py

@@ -72,10 +72,11 @@ class AndroidDriver(AndroidPage,
         try:
             if is_method:
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(AndroidAssertion(self.base_data), ope_key, ope_value)
+                return Mango.s_e(AndroidAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
+                return MangoAssertion(self.base_data.mysql_connect) \
+                    .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.error(f'安卓自动化失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

mangoautomation/uidrive/android/_assertion.py

@@ -17,64 +17,68 @@ class AndroidAssertion(metaclass=Meta):
     def __init__(self, base_data: BaseData):
         self.base_data = base_data
 
-    @sync_method_callback('ass_android', '元素断言', 1,[
+    @sync_method_callback('ass_android', '元素断言', 1, [
         MethodModel(f='actual')])
     def a_assert_ele_exists(self, actual: UiObject):
         """元素存在"""
-        assert actual.count
+        assert actual.count, f'实际={actual.count}, 预期=元素存在'
+        return f'实际={actual.count}, 预期=元素存在'
 
-    @sync_method_callback('ass_android', '元素断言', 2,[
+    @sync_method_callback('ass_android', '元素断言', 2, [
         MethodModel(f='actual'),
         MethodModel(f='expect', p='请输入预期内容', d=True)])
     def a_assert_ele_count(self, actual: UiObject, expect):
         """元素计数"""
-        assert int(actual.count) == int(expect)
+        assert int(actual.count) == int(expect), f'实际={actual.count}, 预期={expect}'
+        return f'实际={actual.count}, 预期={expect}'
 
-    @sync_method_callback('ass_android', '元素断言', 3,[
+    @sync_method_callback('ass_android', '元素断言', 3, [
         MethodModel(f='actual'),
         MethodModel(f='expect', p='请输入预期文本', d=True)])
     def a_assert_ele_text(self, actual: UiObject, expect: str):
         """元素文本内容"""
-        assert actual.get_text() == expect, \
-            f"实际='{actual.get_text()}', 预期='{expect}'"
+        assert actual.get_text() == expect, f"实际='{actual.get_text()}', 预期='{expect}'"
+        return f'实际={actual.get_text()}, 预期={expect}'
 
-    @sync_method_callback('ass_android', '元素断言', 4,[
+    @sync_method_callback('ass_android', '元素断言', 4, [
         MethodModel(f='actual')])
     def a_assert_ele_clickable_true(self, actual: UiObject):
         """元素可点击"""
-        assert actual.info['clickable'], \
-            f"实际={actual.info['clickable']}, 预期=可点击"
+        assert actual.info['clickable'], f"实际={actual.info['clickable']}, 预期=可点击"
+        return f"实际={actual.info['clickable']}, 预期=可点击"
 
-    @sync_method_callback('ass_android', '元素断言', 5,[
+    @sync_method_callback('ass_android', '元素断言', 5, [
         MethodModel(f='actual')])
     def a_assert_ele_clickable_false(self, actual: UiObject):
         """元素不可点击"""
-        assert not actual.info['clickable'], \
-            f"实际={actual.info['clickable']}, 预期=元素不可点击"
+        assert not actual.info['clickable'], f"实际={actual.info['clickable']}, 预期=元素不可点击"
+        return f"实际={actual.info['clickable']}, 预期=元素不可点击"
 
-    @sync_method_callback('ass_android', '元素断言', 6,[
+    @sync_method_callback('ass_android', '元素断言', 6, [
         MethodModel(f='actual')])
     def a_assert_ele_visible_true(self, actual: UiObject):
         """元素可见"""
-        assert actual.exists and actual.info['visible'], \
-            f"实际={actual.info['visible']}, 预期=元素可见"
+        assert actual.exists and actual.info['visible'], f"实际={actual.info['visible']}, 预期=元素可见"
 
-    @sync_method_callback('ass_android', '元素断言', 7,[
+        return f"实际={actual.info['visible']}, 预期=元素可见"
+
+    @sync_method_callback('ass_android', '元素断言', 7, [
         MethodModel(f='actual')])
     def a_assert_ele_visible_false(self, actual: UiObject):
         """元素不可见"""
-        assert actual.exists and not actual.info['visible'], \
-            f"实际={actual.info['visible']}, 预期=元素不可见"
+        assert actual.exists and not actual.info['visible'], f"实际={actual.info['visible']}, 预期=元素不可见"
+        return f"实际={actual.info['visible']}, 预期=元素不可见"
 
-    @sync_method_callback('ass_android', '元素断言', 8,[
+    @sync_method_callback('ass_android', '元素断言', 8, [
         MethodModel(f='expect', p='请输入弹窗标题文本', d=False)])
     def a_assert_dialog_exists(self, expect: str):
         """弹窗存在"""
         dialog = self.base_data.android(text=expect) if expect else self.base_data.android(
             className="android.app.AlertDialog")
         assert dialog.exists, "未找到预期弹窗"
+        return f"实际={dialog.exists}, 预期=弹窗存在"
 
-    @sync_method_callback('ass_android', '元素断言', 9,[
+    @sync_method_callback('ass_android', '元素断言', 9, [
         MethodModel(f='actual'),
         MethodModel(f='expect', p='请输入断言目标文本', d=True)])
     def a_assert_ele_in_list(self, actual: UiObject, expect: str):
@@ -83,3 +87,4 @@ class AndroidAssertion(metaclass=Meta):
             raise AssertionError("传入的元素不是可滑动的列表")
         actual.scroll.vert.to(text=expect)
         assert self.base_data.android(text=expect).exists, f"列表中未找到文本: {expect}"
+        return f"实际={self.base_data.android(text=expect).exists}, 预期={expect}"

mangoautomation/uidrive/web/async_web/__init__.py

@@ -64,7 +64,7 @@ class AsyncWebDevice(AsyncWebBrowser,
             self.base_data.log.error(f'WEB自动化操作失败-3，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0012)
 
-    async def web_assertion_element(self, name, ope_key, ope_value):
+    async def web_assertion_element(self, name, ope_key, ope_value) -> str:
         self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
         is_method = callable(getattr(AsyncWebAssertion, ope_key, None))
         try:
@@ -73,10 +73,11 @@ class AsyncWebDevice(AsyncWebBrowser,
                     traceback.print_exc()
                     raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
-                await Mango.a_e(AsyncWebAssertion(self.base_data), ope_key, ope_value)
+                return await Mango.a_e(AsyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
+                return MangoAssertion(self.base_data.mysql_connect) \
+                    .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

mangoautomation/uidrive/web/async_web/_assertion.py

@@ -28,6 +28,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_have_count(int(expect))
         except AssertionError as e:
             raise AssertionError(f'实际={await actual.count()}, 预期={expect}') from e
+        return f'实际={await actual.count()}, 预期={expect}'
 
     @async_method_callback('ass_web', '元素断言', 1, [MethodModel(f='actual')])
     async def w_all_not_to_be_empty(self, actual: Locator):
@@ -35,6 +36,7 @@ class AsyncWebAssertion(metaclass=Meta):
         count = await actual.count()
         if count == 0:
             assert False, f'实际={count}, 预期>0'
+        return f'实际={count}, 预期>0'
 
     @async_method_callback('ass_web', '元素断言', 1, [
         MethodModel(f='actual'),
@@ -43,10 +45,13 @@ class AsyncWebAssertion(metaclass=Meta):
         """元素是否存在"""
         if int(expect) == 0:
             assert actual is None, f'实际={actual}, 预期={expect}'
+            return f'实际={actual}, 预期={expect}'
+
         else:
             if actual:
                 try:
-                    await exp(actual).to_have_count(int(expect)),
+                    await exp(actual).to_have_count(int(expect))
+                    return f'实际={actual.count()}, 预期={expect}'
                 except AssertionError as e:
                     raise AssertionError(f'实际={actual.count()}, 预期={expect}') from e
             else:
@@ -61,6 +66,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_contain_text(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期={expect}') from e
+        return f'实际={actual}, 预期={expect}'
 
     @async_method_callback('ass_web', '元素断言', 3, [MethodModel(f='actual')])
     async def w_not_to_be_empty(self, actual: Locator):
@@ -69,6 +75,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_empty()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不为空') from e
+        return f'实际={actual}, 预期=不为空'
 
     @async_method_callback('ass_web', '元素断言', 4, [MethodModel(f='actual')])
     async def w_not_to_be_enabled(self, actual: Locator):
@@ -77,6 +84,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_enabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不启用') from e
+        return f'实际={actual}, 预期=不启用'
 
     @async_method_callback('ass_web', '元素断言', 5, [MethodModel(f='actual')])
     async def w_not_to_be_focused(self, actual: Locator):
@@ -85,6 +93,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_focused()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不聚焦') from e
+        return f'实际={actual}, 预期=不聚焦'
 
     @async_method_callback('ass_web', '元素断言', 6, [MethodModel(f='actual')])
     async def w_not_to_be_hidden(self, actual: Locator):
@@ -93,6 +102,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_hidden()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可隐藏') from e
+        return f'实际={actual}, 预期=不可隐藏'
 
     @async_method_callback('ass_web', '元素断言', 7, [MethodModel(f='actual')])
     async def w_not_to_be_in_viewport(self, actual: Locator):
@@ -101,6 +111,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_in_viewport()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不在视窗中') from e
+        return f'实际={actual}, 预期=不在视窗中'
 
     @async_method_callback('ass_web', '元素断言', 8, [MethodModel(f='actual')])
     async def w_not_to_be_visible(self, actual: Locator):
@@ -109,6 +120,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可见') from e
+        return f'实际={actual}, 预期=不可见'
 
     @async_method_callback('ass_web', '元素断言', 9, [
         MethodModel(f='actual'),
@@ -119,6 +131,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_have_class(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=没有阶级') from e
+        return f'实际={actual}, 预期=没有阶级'
 
     @async_method_callback('ass_web', '元素断言', 10, [MethodModel(f='actual')])
     async def w_to_be_checked(self, actual: Locator):
@@ -127,6 +140,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_checked()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=复选框已选中') from e
+        return f'实际={actual}, 预期=复选框已选中'
 
     @async_method_callback('ass_web', '元素断言', 11, [MethodModel(f='actual')])
     async def w_to_be_disabled(self, actual: Locator):
@@ -135,6 +149,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_disabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已禁用') from e
+        return f'实际={actual}, 预期=已禁用'
 
     @async_method_callback('ass_web', '元素断言', 12, [MethodModel(f='actual')])
     async def w_not_to_be_editable(self, actual: Locator):
@@ -143,15 +158,18 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_editable()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已启用') from e
+        return f'实际={actual}, 预期=已启用'
 
     @async_method_callback('ass_web', '元素断言', 13, [MethodModel(f='actual')])
     async def w_to_be_empty(self, actual: Locator | list | None):
         """元素为空"""
         if actual is None:
             assert True, f'实际={actual}, 预期=为空'
+            return f'实际={actual}, 预期=为空'
         else:
             try:
                 await exp(actual).to_be_empty()
+                return f'实际={actual}, 预期=为空'
             except AssertionError as e:
                 raise AssertionError(f'实际={actual}, 预期=为空') from e
 
@@ -162,6 +180,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=可见') from e
+        return f'实际={actual}, 预期=可见'
     # @staticmethod
     # async def w_not_to_have_actuals(actual: Locator, actuals: list):
     #     """选择已选择选项"""
@@ -282,9 +301,3 @@ class AsyncWebAssertion(metaclass=Meta):
     #     """有价值"""
     #     locator = self.page.locator("input[type=number]")
     #     exp(locator).to_have_actual(re.compile(r"[0-9]"))
-
-
-if __name__ == '__main__':
-    from mangokit.decorator import func_info
-
-    print(func_info)

mangoautomation/uidrive/web/async_web/_new_browser.py

@@ -101,7 +101,7 @@ class AsyncWebNewBrowser:
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def new_context(self) -> BrowserContext:
-        args_dict = {}
+        args_dict = {'ignore_https_errors': True}
         if self.web_is_default:
             args_dict["viewport"] = {"width": 1920, "height": 1080}
         if self.web_h5:

mangoautomation/uidrive/web/sync_web/__init__.py

@@ -64,7 +64,7 @@ class SyncWebDevice(SyncWebBrowser,
             self.base_data.log.error(f'WEB自动化操作失败-3，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0012)
 
-    def web_assertion_element(self, name, ope_key, ope_value):
+    def web_assertion_element(self, name, ope_key, ope_value) -> str:
         self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
         is_method = callable(getattr(SyncWebAssertion, ope_key, None))
         try:
@@ -72,10 +72,11 @@ class SyncWebDevice(SyncWebBrowser,
                 if ope_value.get('actual', None) is None:
                     raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(SyncWebAssertion(self.base_data), ope_key, ope_value)
+                return Mango.s_e(SyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
+                return MangoAssertion(self.base_data.mysql_connect) \
+                    .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

mangoautomation/uidrive/web/sync_web/_assertion.py

@@ -5,10 +5,12 @@
 
 from playwright.sync_api import Locator, expect as exp
 
-from ....tools import Meta
-from ....uidrive._base_data import BaseData
 from mangotools.decorator import sync_method_callback
+from mangotools.exceptions.error_msg import ERROR_MSG_0021
 from mangotools.models import MethodModel
+from ....exceptions import MangoAutomationError
+from ....tools import Meta
+from ....uidrive._base_data import BaseData
 
 
 class SyncWebAssertion(metaclass=Meta):
@@ -26,6 +28,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_have_count(int(expect))
         except AssertionError as e:
             raise AssertionError(f'实际={actual.count()}, 预期={expect}') from e
+        return f'实际={actual.count()}, 预期={expect}'
 
     @sync_method_callback('ass_web', '元素断言', 1, [MethodModel(f='actual')])
     def w_all_not_to_be_empty(self, actual: Locator):
@@ -33,6 +36,7 @@ class SyncWebAssertion(metaclass=Meta):
         count = actual.count()
         if count == 0:
             assert False, f'实际={count}, 预期>0'
+        return f'实际={count}, 预期>0'
 
     @sync_method_callback('ass_web', '元素断言', 1, [
         MethodModel(f='actual'),
@@ -41,10 +45,12 @@ class SyncWebAssertion(metaclass=Meta):
         """元素存在个数"""
         if int(expect) == 0:
             assert actual is None, f'实际={actual}, 预期={expect}'
+            return f'实际={actual}, 预期={expect}'
         else:
             if actual:
                 try:
                     exp(actual).to_have_count(int(expect))
+                    return f'实际={actual.count()}, 预期={expect}'
                 except AssertionError as e:
                     raise AssertionError(f'实际={actual.count()}, 预期={expect}') from e
             else:
@@ -59,6 +65,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_contain_text(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期={expect}') from e
+        return f'实际={actual}, 预期={expect}'
 
     @sync_method_callback('ass_web', '元素断言', 3, [MethodModel(f='actual')])
     def w_not_to_be_empty(self, actual: Locator):
@@ -67,6 +74,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_empty()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不为空') from e
+        return f'实际={actual}, 预期=不为空'
 
     @sync_method_callback('ass_web', '元素断言', 4, [MethodModel(f='actual')])
     def w_not_to_be_enabled(self, actual: Locator):
@@ -75,6 +83,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_enabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不启用') from e
+        return f'实际={actual}, 预期=不启用'
 
     @sync_method_callback('ass_web', '元素断言', 5, [MethodModel(f='actual')])
     def w_not_to_be_focused(self, actual: Locator):
@@ -83,6 +92,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_focused()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不聚焦') from e
+        return f'实际={actual}, 预期=不聚焦'
 
     @sync_method_callback('ass_web', '元素断言', 6, [MethodModel(f='actual')])
     def w_not_to_be_hidden(self, actual: Locator):
@@ -91,6 +101,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_hidden()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可隐藏') from e
+        return f'实际={actual}, 预期=不可隐藏'
 
     @sync_method_callback('ass_web', '元素断言', 7, [MethodModel(f='actual')])
     def w_not_to_be_in_viewport(self, actual: Locator):
@@ -99,6 +110,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_in_viewport()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不在视窗中') from e
+        return f'实际={actual}, 预期=不在视窗中'
 
     @sync_method_callback('ass_web', '元素断言', 8, [MethodModel(f='actual')])
     def w_not_to_be_visible(self, actual: Locator):
@@ -107,6 +119,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可见') from e
+        return f'实际={actual}, 预期=不可见'
 
     @sync_method_callback('ass_web', '元素断言', 9, [
         MethodModel(f='actual'),
@@ -117,6 +130,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_have_class(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=没有阶级') from e
+        return f'实际={actual}, 预期=没有阶级'
 
     @sync_method_callback('ass_web', '元素断言', 10, [MethodModel(f='actual')])
     def w_to_be_checked(self, actual: Locator):
@@ -125,6 +139,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_checked()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=复选框已选中') from e
+        return f'实际={actual}, 预期=复选框已选中'
 
     @sync_method_callback('ass_web', '元素断言', 11, [MethodModel(f='actual')])
     def w_to_be_disabled(self, actual: Locator):
@@ -133,6 +148,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_disabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已禁用') from e
+        return f'实际={actual}, 预期=已禁用'
 
     @sync_method_callback('ass_web', '元素断言', 12, [MethodModel(f='actual')])
     def w_not_to_be_editable(self, actual: Locator):
@@ -141,15 +157,19 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_editable()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已启用') from e
+        return f'实际={actual}, 预期=已启用'
 
     @sync_method_callback('ass_web', '元素断言', 13, [MethodModel(f='actual')])
     def w_to_be_empty(self, actual: Locator | list | None):
         """元素为空"""
         if actual is None:
             assert True, f'实际={actual}, 预期=为空'
+            return f'实际={actual}, 预期=为空'
+
         else:
             try:
                 exp(actual).to_be_empty()
+                return f'实际={actual}, 预期=为空'
             except AssertionError as e:
                 raise AssertionError(f'实际={actual}, 预期=为空') from e
 
@@ -160,6 +180,8 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=可见') from e
+        return f'实际={actual}, 预期=可见'
+
     # @staticmethod
     # def w_not_to_have_actuals(actual: Locator, actuals: list):
     #     """选择已选择选项"""

mangoautomation/uidrive/web/sync_web/_new_browser.py

@@ -101,7 +101,7 @@ class SyncWebNewBrowser:
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def new_context(self) -> BrowserContext:
-        args_dict = {}
+        args_dict = {'ignore_https_errors': True}
         if self.web_is_default:
             args_dict["viewport"] = {"width": 1920, "height": 1080}
         if self.web_h5:

{mangoautomation-1.0.48.dist-info → mangoautomation-1.0.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.48
+Version: 1.0.50
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -12,7 +12,7 @@ Requires-Dist: pydantic ==2.9.2
 Requires-Dist: playwright ==1.43.0
 Requires-Dist: uiautomation ==2.0.20
 Requires-Dist: uiautomator2 ==3.2.5
-Requires-Dist: mangotools >=1.1.14
+Requires-Dist: mangotools >=1.1.17
 Requires-Dist: adbutils ~=2.8.9
 Requires-Dist: uiautodev ==0.9.0
 

{mangoautomation-1.0.48.dist-info → mangoautomation-1.0.50.dist-info}/RECORD

@@ -5,19 +5,19 @@ mangoautomation/enums/_ui_enum.py,sha256=rdkejsyc4ogZbyNfZcp1q0V0bDPo14vg0A6or6S
 mangoautomation/exceptions/__init__.py,sha256=dXtRZSuYg3e_lwYUKYvYjtxTKHITdbi2l9XkHk9DpfY,374
 mangoautomation/exceptions/_error_msg.py,sha256=GrB9crXQMNlq1Ng8a7RsuKfDHDhXglu_CQ_62lhj_iQ,5437
 mangoautomation/exceptions/_exceptions.py,sha256=BiyST1QPivpfIOuKn1gKhpXOyBv6gfip_KvlQuu8ctw,385
-mangoautomation/models/__init__.py,sha256=Vc0MADLdIY2TkWelDeXdvLlg3QbVF5U8pc_-1UyWsNU,418
-mangoautomation/models/_ui_model.py,sha256=IGophozQMO-NQjM_DPdlwud484yfWQw1CRwbDWjI3Vs,1446
+mangoautomation/models/__init__.py,sha256=59J8VjshTxZK4xX_-_NBqdLZ1OuvuZPSpljY1Jc-4eQ,416
+mangoautomation/models/_ui_model.py,sha256=wKiBNpGDhSVCAYf798I0bMzdhCGXfSOptMCQrBLTUCM,1416
 mangoautomation/tools/__init__.py,sha256=cc6zpsEdp3JiIx7HfOz-Vob7oTIIFzsuxDLgl20har4,443
 mangoautomation/tools/_mate.py,sha256=9lk_EJnAX_OyXbe5WacyHkkcEr2ScBgasl6eUnlklWA,405
 mangoautomation/tools/_uiautodev.py,sha256=RMOQMXse744xwUDb1_l7qDv9mUiqZt1Gm5sbB-nlgDk,1388
 mangoautomation/uidrive/__init__.py,sha256=Tk_gh4Qg2qnewEGxa-7Id4fkQLY3fvQE4X7JB0BEscY,577
-mangoautomation/uidrive/_async_element.py,sha256=al5j4bw8OcBo2Prb8gHTzbtf3KYL-Tr5fPoRUuOlEoY,13424
+mangoautomation/uidrive/_async_element.py,sha256=CqQoYVkMjbFoAzFeWgdytf2fJ27-1ZZG_ZLmqAuRin0,13729
 mangoautomation/uidrive/_base_data.py,sha256=ur2Ts40MAhOYXb0vGVXZdSwEVCI3Csri9I9f1pw1r4Y,3766
 mangoautomation/uidrive/_driver_object.py,sha256=Re8j6VLHKfwW2VFdi-1XFRuix8tRBLcHYRBLVF6CApE,1962
-mangoautomation/uidrive/_sync_element.py,sha256=e67DngrDdJyug5nT-Gf1fcTAHAM-0lVmvrAHOhgfwjQ,13242
-mangoautomation/uidrive/android/__init__.py,sha256=T-Xyd0_Ea4G4YAbasI4cGF4Sb8c4383ohRmRExs8mAs,5461
+mangoautomation/uidrive/_sync_element.py,sha256=IKLhqttcV1d5zFj41IgIs56_bJZMNEPkO7Ah64hcpKg,13547
+mangoautomation/uidrive/android/__init__.py,sha256=SWn7PwRZOf34LCE9KigClDaV8R0n70rqLsG6hCeAok0,5499
 mangoautomation/uidrive/android/_application.py,sha256=EeEM0MPtOPeYeKx92mtMFWqGpCRmri-D_CzXvPt13RA,2800
-mangoautomation/uidrive/android/_assertion.py,sha256=IytUBalJwOQNwwVFaL-Di79-TBFbBs5pnoCVqqptZQg,3631
+mangoautomation/uidrive/android/_assertion.py,sha256=Gzic7cH3_Vr6NLiMBPRJr7q1F8YFF2dEopINMR4XQFc,4289
 mangoautomation/uidrive/android/_customization.py,sha256=pCLMmruozOyCJQZWAYupxxKqpWmZyCYsfSBw3XW7vf0,381
 mangoautomation/uidrive/android/_element.py,sha256=lOrQyQhOoJ2LrbiQ9t0wxH7LcpwZgyDxU0iUuKaSjRo,6989
 mangoautomation/uidrive/android/_equipment.py,sha256=WRaXLf4DuVzxG8TL5c4lHam6hZo_jsWwitYQUun3Srk,5125
@@ -31,27 +31,27 @@ mangoautomation/uidrive/pc/element.py,sha256=LdlWHhvXsaHH6jTp6nNrF81OWPtx81dct4y
 mangoautomation/uidrive/pc/input_device.py,sha256=F6ZqKja3XkJww66x3l9Idha3R19D832J-5TfiKWmUso,353
 mangoautomation/uidrive/pc/new_windows.py,sha256=lETHZa7cW8Z0iUShzgVTRxqivkYaOo8WIE58q_8KYfQ,2338
 mangoautomation/uidrive/web/__init__.py,sha256=MgTklzty_SvX4UemCnqJuViq3cIjUgAjFoEtP-mcDWw,123
-mangoautomation/uidrive/web/async_web/__init__.py,sha256=oIVFUs3RX7Z_cSkz2mAzWceBF38zSr0lPaD0LahTlWA,8356
-mangoautomation/uidrive/web/async_web/_assertion.py,sha256=8cLYPe3pP6FrcjDZoFOphP7psgoJJMozq0Z_BDGNXCo,11859
+mangoautomation/uidrive/web/async_web/__init__.py,sha256=awtvLCGjUKIx46d2rZpO2CcuBK2WAKZ7PN6yt6ztlBA,8401
+mangoautomation/uidrive/web/async_web/_assertion.py,sha256=iC_j2pZN1pr2kFmxjEb8fBSX91M0BmrcRKARe3JH-kQ,12761
 mangoautomation/uidrive/web/async_web/_browser.py,sha256=39YroURzagpq0HoEn1RZnNf1KDKXIgWpKSvp5L_Yut0,5286
 mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
 mangoautomation/uidrive/web/async_web/_element.py,sha256=btIkX2nlic17sgSbXtNZ8h5wD-rPyIK6TH5fH4WaoPk,9506
 mangoautomation/uidrive/web/async_web/_input_device.py,sha256=sMAMHb_8QyPx3pKci0gRDQc2O7h1OYMGyA7fCWl81iM,3288
-mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=gKjrbDQwDON-Omd2QFKdzMHYLxWd0L_cdM_tXYNz5TI,5597
+mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=WsQ-s2QCjXiePN_u4bLwpds_QpuDd9V2w6hLuLCB-zg,5624
 mangoautomation/uidrive/web/async_web/_page.py,sha256=TCYf79qQdVBBTTNq2COZFJVcLCgg5Ksu9lMgmQPVInU,2147
-mangoautomation/uidrive/web/sync_web/__init__.py,sha256=HLVBtv6kyM2DhHUQx-vRF3vgus8mSrShh3wEiCwHbLM,7916
-mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=zZ4_4WiBQFSRwAh0P0JANa5z-ozbNTh3bnUqcZBti9s,11424
+mangoautomation/uidrive/web/sync_web/__init__.py,sha256=31U15FJftsv6yyDlKT-2zN0CNPyolZPRuPh7mdeKKas,7961
+mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=hVA7-Z3CfPgkmtnK_3M5UGo6sct88W6AJfQTnrqu9jU,12534
 mangoautomation/uidrive/web/sync_web/_browser.py,sha256=c7xHkIIFPawlzcVkGjwqeKfWAM--87wEJb3V3Ysi29w,5146
 mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
 mangoautomation/uidrive/web/sync_web/_element.py,sha256=P5kSFkKyRP8a7qpKJZf_Lhp6Ik1jgHfIVB8Tgpl7kNw,9078
 mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=8t6tJgMb4zgb4Sv02XP3gUU0ZVbApCs3WaILv8Fe1iY,3169
-mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=-JYteNz2O84BRHDwiaGKnl0estWdmnAnbhJclhg2Id0,5489
+mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=LNwhzjf0SbsBAaIXD_bEq623MsX2RvSdLc6tIt1ygjA,5516
 mangoautomation/uidrive/web/sync_web/_page.py,sha256=MNekcL7o5YXEloeuvi3YrpOZxGhEWfrq-5i4PbtTLFg,2027
 tests/__init__.py,sha256=UhCNFqiVjxdh4CXESNo4oE7qfjpYYVkeHbSE5-7LGDY,125
 tests/test_ui_and.py,sha256=4k0_3bx_k2KbZifeRWGK65sxtdiPUOjkNzZ5oxjrc18,672
 tests/test_ui_web.py,sha256=MFaUN8O5qKOMMgyk2eelhKZsYcSJm0Do6pCgsdBZEH4,2765
-mangoautomation-1.0.48.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.48.dist-info/METADATA,sha256=NC4bFUdW6US4OdQYfK3MKQ4WK4RyPHyTTptpOFcVDRw,660
-mangoautomation-1.0.48.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.48.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.48.dist-info/RECORD,,
+mangoautomation-1.0.50.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.0.50.dist-info/METADATA,sha256=v8R6xLYzBVZjRc64yeRMgpmZ6RwBdZdhw5gQgOO8r1I,660
+mangoautomation-1.0.50.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.0.50.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.0.50.dist-info/RECORD,,