Merge pull request #224 from ctripcorp/main_yls_operationandscroll

feat: Web 支持语句：1. 页面没有请求[] 2. 移动元素[]至可视区域

Author: clgwlg

flybirds/core/dsl/globalization/i18n.py

@@ -170,6 +170,7 @@
             "向{param1}扫描[{selector}]的文案"],
         "from {param1} find[{selector}]image": [
             "向{param1}查找[{selector}]的图像"],
+        "move element[{selector}]to view": ["移动元素[{selector}]至可视区域"],
         "unblock the current page": ["解除当前页面限制"],
         "current page is [{param}]": ["当前页面是[{param}]"],
         "current page is not last page": ["当前页面已不是上一个指定页面"],
@@ -202,6 +203,7 @@
         "is [{expect_value}]": [
             "验证服务[{service}]的请求参数[{target_json_path}]"
             "与[{expect_value}]一致"],
+        "page not requested [{service}]": ["页面没有请求[{service}]"],
         "compare target element [{target_element}] with compared picture [{compared_picture_path}]": [
             "对比图片元素[{target_element}]和基准图片路径[{compared_picture_path}]"],
         "compare target element[{target_ele}] with compared text path of [{compared_text_path}]": [

flybirds/core/dsl/step/element.py

@@ -451,6 +451,16 @@ def full_screen_swipe_to_img(context, param1=None, selector=None):
     """
     g_Context.step.full_screen_swipe_to_img(context, param1, selector)
 
+@step("move element[{selector}]to view")
+@ele_wrap
+def scroll_ele_into_view(context, selector=None):
+    """
+    Full screen swipe in the specified direction to find the specified
+     selector element
+     :param context: step context
+    :param selector: locator string for selector element (or None).
+    """
+    g_Context.step.scroll_ele_into_view(context, selector)
 
 @step("clear [{selector}] and input[{param2}]")
 @ele_wrap

flybirds/core/dsl/step/request.py

@@ -140,6 +140,18 @@ def request_compare(context, service=None, target_data_path=None):
     g_Context.step.request_compare_from_path(context, service,
                                              target_data_path)
 
+@step(
+    "page not requested [{service}]"
+)
+@ele_wrap
+def page_not_requested(context, service=None):
+    """
+    compare and verify the request's post body with the data of the target path
+
+    :param context: step context
+    :param service: service request name. (string or None).
+    """
+    g_Context.step.page_not_requested(context, service)
 
 @step(
     "compare service request [{service}] with xml file [{target_data_xml_path}]"

flybirds/core/global_resource.py

@@ -35,7 +35,8 @@ def init_glb():
         "interceptionRequest": {},
         "interceptionValues": {},
         "browser_context": None,
-        "web_context_hook": None
+        "web_context_hook": None,
+        "operate_record": {},
     }
 
 

flybirds/core/plugin/plugins/default/web/interception.py

@@ -255,6 +255,13 @@ def request_compare(operation, target_data_path):
         # Call the handle_diff() function to compare the differences between the actual request object
         # and the expected request object, and output the log
         handle_diff(actual_request_obj, expect_request_obj, operation, target_data_path)
+    
+    @staticmethod
+    def page_not_requested(operation):
+        request_info = get_server_request_opetate(operation)
+        if request_info:
+            message = f'[pageNotRequested] the request [{operation}] has been requested'
+            raise FlybirdsException(message)
 
     @staticmethod
     def request_query_string_compare(operation, target_data_path):
@@ -609,6 +616,11 @@ def get_server_request_body(service):
         return interception_request.get(service)
     return None
 
+def get_server_request_opetate(service):
+    operate_record = gr.get_value('operate_record')
+    if operate_record:
+        return operate_record.get(service)
+    return None
 
 def handle_ignore_node(service):
     exclude_paths = []

flybirds/core/plugin/plugins/default/web/page.py

@@ -380,7 +380,15 @@ def handle_request(request):
     if operation is not None and len(operation.strip()) > 0:
         interception_request = gr.get_value('interceptionRequest')
         request_body = interception_request.get(operation)
-
+        # 记录页面请求
+        operate_record = gr.get_value('operate_record')
+        operate_record[operation] = {
+            'method': request.method,
+            'postData': request.post_data,
+            'url': request.url,
+            'updateTimeStamp': int(round(time.time() * 1000))
+        }
+        gr.set_value("operate_record", operate_record)
         if request_body is not None:
             log.info(
                 f'[handle_request] start cache service：{operation}')

flybirds/core/plugin/plugins/default/web/step.py

@@ -239,6 +239,14 @@ def full_screen_swipe_to_ele_aaa(cls, context, param_1, selector):
         ele = gr.get_value("plugin_ele")
         ele.find_full_screen_slide(context, param_1, selector)
 
+    @classmethod
+    def scroll_ele_into_view(cls, context, selector):
+        """
+        from {param1} find[{param2}]element
+        """
+        ele = gr.get_value("plugin_ele")
+        ele.find_full_screen_slide(context, None, selector)
+
     @classmethod
     def ele_attr_equal(cls, context, selector, param2, param3):
         ele = gr.get_value("plugin_ele")
@@ -312,6 +320,11 @@ def clear_all_request_mock(context):
     @staticmethod
     def request_compare_from_path(context, operation, target_data_path):
         request_op.request_compare(operation, target_data_path)
+    
+    @staticmethod
+    def page_not_requested(context, operation):
+        request_op.page_not_requested(operation)
+
 
     @staticmethod
     def request_query_str_compare_from_path(context, operation,