mangoautomation 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

mangoautomation/exceptions/_error_msg.py

@@ -14,7 +14,7 @@ ERROR_MSG_0007 = (307, '请先启动容器')
 ERROR_MSG_0008 = (308, '浏览器类型不正确，请联系管理员检查')
 ERROR_MSG_0009 = (309, '浏览器路径不正确，请手动设置一个正确的浏览器路径，现在的路径：{}')
 ERROR_MSG_0010 = (310, '浏览器被关闭，请重试')
-ERROR_MSG_0011 = (311, '操作元素:{} 超时，请检查元素可见但是是否可操作，或元素在iframe中，或调整定位方式')
+ERROR_MSG_0011 = (311, '操作元素【{}】超时，请检查元素可见但是是否可操作或调整定位方式')
 ERROR_MSG_0012 = (312, '操作失败，请检查输入的值是否有空字符串，null或不满足传参的值')
 ERROR_MSG_0013 = (
     313, '打开url时超时，分为2个问题：1.启用的浏览器过多，应当减少浏览器并发个数；2.自行查看为啥60秒还未打开：{}')
@@ -37,14 +37,9 @@ ERROR_MSG_0028 = (328, '一个元素内只能包含一个需要被替换的内
 ERROR_MSG_0029 = (329, '页面无元素：{} 表达式：{}')
 ERROR_MSG_0030 = (330, '断言时没有找到元素')
 ERROR_MSG_0031 = (331, '元素未找到准备进行断言获取元素文本类容异常')
-ERROR_MSG_0032 = (332, '元素：{} 的元素表达式定位的标签无法对应操作的类型，或其他操作异常')
-ERROR_MSG_0033 = (333, 'mysql中无：{}库')
-ERROR_MSG_0034 = (334, 'sql存在语法错误，sql：{}')
-ERROR_MSG_0035 = (335, 'sql语句是空，或查询字段或条件字段不存在')
+ERROR_MSG_0032 = (332, '元素：{} 的元素表达式定位有多个，或其他元素异常，请检查元素是否可用')
 ERROR_MSG_0036 = (336, '公共参数sql在数据库中查询不到结果，sql：{}')
-ERROR_MSG_0037 = (337, '用例前置sql在数据库中查询不到结果，sql：{}')
 ERROR_MSG_0038 = (338, '公共参数的sql_key不是列表')
-ERROR_MSG_0039 = (339, '用例前置的sql_key不是列表')
 ERROR_MSG_0040 = (
     340, '设备启动超时！请检查设备是否开启了：文件传输模式、开发者模式、usb调试，开启后请重新连接电脑，设备号：{}')
 ERROR_MSG_0041 = (341, '查找页面元素时直接失败，元素：{}，报错信息：{}')

mangoautomation/uidrive/web/async_web/__init__.py

@@ -10,9 +10,9 @@ from playwright._impl._errors import TimeoutError, Error, TargetClosedError
 from playwright.async_api._generated import Locator
 
 from mangotools.assertion import PublicAssertion, SqlAssertion
-from mangotools.mangos import Mango
 from mangotools.enums import StatusEnum
-from ....enums import ElementExpEnum
+from mangotools.mangos import Mango
+from ....enums import ElementExpEnum, ElementOperationEnum
 from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import *
 from ....uidrive._base_data import BaseData
@@ -137,6 +137,10 @@ class AsyncWebDevice(AsyncWebBrowser,
                         ele_list.append(locator.nth(nth))
                 else:
                     raise MangoAutomationError(*ERROR_MSG_0023)
+            if not ele_list:
+                raise MangoAutomationError(*ERROR_MSG_0023)
+            if not ele_list and _type == ElementOperationEnum.OPE.value:
+                raise MangoAutomationError(*ERROR_MSG_0029, value=(name, loc))
             try:
                 count = len(ele_list)
                 loc = ele_list[sub - 1] if sub else ele_list

mangoautomation/uidrive/web/async_web/_element.py

@@ -58,7 +58,6 @@ class AsyncWebElement(metaclass=Meta):
         value = await locating.inner_text()
         if set_cache_key:
             self.base_data.test_data.set_cache(key=set_cache_key, value=value)
-
         return value
 
     @async_method_callback('web', '元素操作', 6, [
@@ -98,6 +97,12 @@ class AsyncWebElement(metaclass=Meta):
         await download.save_as(save_path)
         self.base_data.test_data.set_cache(file_key, file_name)
 
+    @async_method_callback('web', '元素操作', 9, [
+        MethodModel(f='locating')])
+    async def w_element_wheel(self, locating: Locator):
+        """滚动到元素位置"""
+        await locating.scroll_into_view_if_needed()
+
     @async_method_callback('web', '元素操作', 9, [
         MethodModel(f='locating1'),
         MethodModel(f='locating2')])

mangoautomation/uidrive/web/async_web/_input_device.py

@@ -2,7 +2,6 @@
 # @Project: 芒果测试平台
 # @Description: # @Time   : 2023-04-29 12:11
 # @Author : 毛鹏
-from playwright.async_api import Locator
 
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
@@ -22,10 +21,6 @@ class AsyncWebDeviceInput(metaclass=Meta):
         """模拟按下指定的键"""
         await self.base_data.page.keyboard.press(str(keyboard))
 
-    async def w_element_wheel(self, locating: Locator):
-        """滚动到元素位置"""
-        await locating.scroll_into_view_if_needed()
-
     @async_method_callback('web', '输入设备', 1, [
         MethodModel(f='y', p='请输入向上滚动像素', d=True)])
     async def w_wheel(self, y):

mangoautomation/uidrive/web/sync_web/_element.py

@@ -7,12 +7,12 @@ import os
 import time
 from playwright.sync_api import Locator, Error
 
+from mangotools.decorator import sync_method_callback
+from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import ERROR_MSG_0024, ERROR_MSG_0056
 from ....tools import Meta
 from ....uidrive._base_data import BaseData
-from mangotools.decorator import sync_method_callback
-from mangotools.models import MethodModel
 
 
 class SyncWebElement(metaclass=Meta):
@@ -57,7 +57,6 @@ class SyncWebElement(metaclass=Meta):
         value = locating.inner_text()
         if set_cache_key:
             self.base_data.test_data.set_cache(key=set_cache_key, value=value)
-
         return value
 
     @sync_method_callback('web', '元素操作', 6, [
@@ -97,6 +96,12 @@ class SyncWebElement(metaclass=Meta):
         download.save_as(save_path)
         self.base_data.test_data.set_cache(file_key, file_name)
 
+    @sync_method_callback('web', '元素操作', 9, [
+        MethodModel(f='locating')])
+    def w_element_wheel(self, locating: Locator):
+        """滚动到元素位置"""
+        locating.scroll_into_view_if_needed()
+
     @sync_method_callback('web', '元素操作', 9, [
         MethodModel(f='locating1'),
         MethodModel(f='locating2')])

{mangoautomation-1.0.0.dist-info → mangoautomation-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.0
+Version: 1.0.2
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏

{mangoautomation-1.0.0.dist-info → mangoautomation-1.0.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ mangoautomation/enums/__init__.py,sha256=xPv6158_Tup3U9rbYtUGgWR8W479-7czLvcRk4D
 mangoautomation/enums/_base_enum.py,sha256=dpaXsdhWY08BhIzi1B1ksh_p18ZTmhWvTYhbd3n_ONQ,1176
 mangoautomation/enums/_ui_enum.py,sha256=rdkejsyc4ogZbyNfZcp1q0V0bDPo14vg0A6or6ShaXA,4494
 mangoautomation/exceptions/__init__.py,sha256=dXtRZSuYg3e_lwYUKYvYjtxTKHITdbi2l9XkHk9DpfY,374
-mangoautomation/exceptions/_error_msg.py,sha256=CIwAJAEeXGr93zKWY75NxjqIhcuux0wn0ZTf6jYwfUs,6339
+mangoautomation/exceptions/_error_msg.py,sha256=IhD60gAFfqtOWraDhuKuh_5y6GtpCAtWD2E3BkoRPoQ,5983
 mangoautomation/exceptions/_exceptions.py,sha256=s3vF0g4nGA1tPiGdI7Mxv9W7uR3uZ9qUSl-KzYppVEU,371
 mangoautomation/models/__init__.py,sha256=XdqEQNfIw7mcnmv3ZgWPJyFwQvap5Cu2ZMKcIK4wn9M,416
 mangoautomation/models/_ui_model.py,sha256=IGophozQMO-NQjM_DPdlwud484yfWQw1CRwbDWjI3Vs,1446
@@ -29,27 +29,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=54LvEPe3zmjLsXYhk8VB07mkZ7YDAuItej4ibkaokqI,8839
+mangoautomation/uidrive/web/async_web/__init__.py,sha256=gJxCPWUALVzbQJAM5RH_1-7Jto0hcm1kAXy72pZw24g,9106
 mangoautomation/uidrive/web/async_web/_assertion.py,sha256=8cLYPe3pP6FrcjDZoFOphP7psgoJJMozq0Z_BDGNXCo,11859
 mangoautomation/uidrive/web/async_web/_browser.py,sha256=s7piT1w8UHocwF9OnZkff8rFfuNHRMSjCxOSM4BC5DQ,4327
 mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
-mangoautomation/uidrive/web/async_web/_element.py,sha256=EjV4phYHRDCLJiB6XvGvsEctMgr-TWXortBU-L3LL6M,8369
-mangoautomation/uidrive/web/async_web/_input_device.py,sha256=6WjdFX0ff7Pq-dsyGg7VUNDOXFkVknqqQqnvW2RCS54,3479
+mangoautomation/uidrive/web/async_web/_element.py,sha256=kJH2FapesgjpAL9wlnaHrL2lP6OoePg4fBMcNt_TKm0,8609
+mangoautomation/uidrive/web/async_web/_input_device.py,sha256=sMAMHb_8QyPx3pKci0gRDQc2O7h1OYMGyA7fCWl81iM,3288
 mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=cmamXXguIq-Zfhb_je8t3klX5vAaK4IqgENXi9TmmrA,5604
 mangoautomation/uidrive/web/async_web/_page.py,sha256=TCYf79qQdVBBTTNq2COZFJVcLCgg5Ksu9lMgmQPVInU,2147
 mangoautomation/uidrive/web/sync_web/__init__.py,sha256=vHDYYESVi-6ApllUXOrDopcQod3dBXcPlTSAng8eIGE,8662
 mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=zZ4_4WiBQFSRwAh0P0JANa5z-ozbNTh3bnUqcZBti9s,11424
 mangoautomation/uidrive/web/sync_web/_browser.py,sha256=vQJq-TWEUq0rHWLWglE5wptqy8WQKWy4P3NUr2pzsSA,4187
 mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
-mangoautomation/uidrive/web/sync_web/_element.py,sha256=UHQJiH0bmqY7oISk30ePyeUnlTmDM6JS0ESEPg7GKJE,8004
+mangoautomation/uidrive/web/sync_web/_element.py,sha256=fObJa-_pMgSxluerGVMX7BhQ64J7H8YRqitopxZjqSQ,8231
 mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=8t6tJgMb4zgb4Sv02XP3gUU0ZVbApCs3WaILv8Fe1iY,3169
 mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=RO1e4fQoeBol3w8NIx_oxIfRkGvx3ZbPSARTwMwetVQ,5378
 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.0.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.0.dist-info/METADATA,sha256=rWHSMMkVZD9Ktq3THbVV-9a231Hk3Jap9YO20qUdlYI,624
-mangoautomation-1.0.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.0.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.0.dist-info/RECORD,,
+mangoautomation-1.0.2.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.0.2.dist-info/METADATA,sha256=0qiU0G3_yuWD7dVZLViveNrIHv9LnKQsgfECxhVRpBs,624
+mangoautomation-1.0.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.0.2.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.0.2.dist-info/RECORD,,