mangoautomation 1.0.37__tar.gz → 1.0.39__tar.gz

{mangoautomation-1.0.37/mangoautomation.egg-info → mangoautomation-1.0.39}/PKG-INFO

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

{mangoautomation-1.0.37 → mangoautomation-1.0.39}/mangoautomation/uidrive/_async_element.py

@@ -41,7 +41,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             self.base_data.log.debug(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-
     async def element_main(self, element_model: ElementModel, element_data: dict | None = None) -> ElementResultModel:
         self.element_model = element_model
         self.element_data = element_data
@@ -93,8 +92,11 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
     async def __main(self):
         try:
             self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
+            self.element_result_model.loc = self.element_model.loc
             self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
+            self.element_result_model.sleep = self.element_model.sleep
             self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
+            self.element_result_model.sub = self.element_model.sub
         except MangoAutomationError as error:
             self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
             raise MangoAutomationError(error.code, error.msg)

{mangoautomation-1.0.37 → mangoautomation-1.0.39}/mangoautomation/uidrive/_sync_element.py

@@ -92,8 +92,11 @@ class SyncElement(SyncWebDevice, AndroidDriver):
     def __main(self):
         try:
             self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
+            self.element_result_model.loc = self.element_model.loc
             self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
+            self.element_result_model.sleep = self.element_model.sleep
             self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
+            self.element_result_model.sub = self.element_model.sub
         except MangoAutomationError as error:
             self.base_data.log.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
             raise MangoAutomationError(error.code, error.msg)

{mangoautomation-1.0.37 → mangoautomation-1.0.39}/mangoautomation/uidrive/web/async_web/_new_browser.py

@@ -101,16 +101,15 @@ class AsyncWebNewBrowser:
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def new_context(self) -> BrowserContext:
-        args_dict = {
-            'no_viewport': True,
-        }
-
-        if self.web_recording and self.videos_path:
-            args_dict['record_video_dir'] = self.videos_path
-
+        args_dict = {}
+        if self.web_is_default:
+            args_dict["viewport"] = {"width": 1600, "height": 1080}
         if self.web_h5:
-            del args_dict['no_viewport']
             args_dict.update(self.playwright.devices[self.web_h5])
+        if not (self.web_is_default or self.web_h5):
+            args_dict["no_viewport"] = True
+        if self.web_recording and self.videos_path:
+            args_dict["record_video_dir"] = self.videos_path
         return await self.browser.new_context(**args_dict)
 
     async def new_page(self, context: BrowserContext) -> Page:

{mangoautomation-1.0.37 → mangoautomation-1.0.39}/mangoautomation/uidrive/web/sync_web/_new_browser.py

@@ -101,16 +101,15 @@ class SyncWebNewBrowser:
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def new_context(self) -> BrowserContext:
-        args_dict = {
-            'no_viewport': True,
-        }
-
-        if self.web_recording and self.videos_path:
-            args_dict['record_video_dir'] = self.videos_path
-
+        args_dict = {}
+        if self.web_is_default:
+            args_dict["viewport"] = {"width": 1600, "height": 1080}
         if self.web_h5:
-            del args_dict['no_viewport']
             args_dict.update(self.playwright.devices[self.web_h5])
+        if not (self.web_is_default or self.web_h5):
+            args_dict["no_viewport"] = True
+        if self.web_recording and self.videos_path:
+            args_dict["record_video_dir"] = self.videos_path
         return self.browser.new_context(**args_dict)
 
     def new_page(self, context: BrowserContext) -> Page:

{mangoautomation-1.0.37 → mangoautomation-1.0.39/mangoautomation.egg-info}/PKG-INFO

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

{mangoautomation-1.0.37 → mangoautomation-1.0.39}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.37'
+__version__ = '1.0.39'
 
 with open("README.md", "r", encoding='utf-8') as fh:
     long_description = fh.read()