Merge pull request #24 from ctripcorp/feat_web_new

fix: handle Uppercase and lowercase

flybirds/core/config_manage.py

@@ -156,7 +156,7 @@ def __init__(self, user_data, config):
             if device_info.__contains__("webDriverAgent"):
                 device_driver = device_info["webDriverAgent"]
 
-            self.platform = user_data.get("platform", platform)
+            self.platform = user_data.get("platform", platform).lower()
             self.web_driver_agent = device_driver
             self.screen_size = None
 

flybirds/core/launch_cycle/run_manage.py

@@ -148,6 +148,11 @@ def run_script(run_args):
 def need_parallel_run(context):
     user_data = get_use_define_param(context, 'platform')
     platform = DeviceConfig(user_data, None).platform
+    # check platform
+    if platform not in ['ios', 'android', 'web']:
+        log.warn(f'flybirds is not supports to run on {platform} '
+                 f'platform. It will now run on Android by default.')
+        platform = "android"
     context['cur_platform'] = platform
     if 'web' == platform.lower():
         return True

flybirds/core/plugin/loader.py

@@ -57,8 +57,8 @@ def run(context):
             browser_types = browser_type.split(',')
             browser_types = list(set(browser_types))
             temp = []
-            [temp.append(i) for i in browser_types if
-             i in ['chromium', 'firefox', 'webkit']]
+            [temp.append(i.strip().lower()) for i in browser_types if
+             i.strip().lower() in ['chromium', 'firefox', 'webkit']]
             if len(temp) == 0:
                 temp.append('chromium')
             user_data['browserType'] = ",".join(temp)

flybirds/report/parallel_runner.py

@@ -156,8 +156,8 @@ def get_browser_types(context):
         browser_types = browser_type.split(',')
     browser_types = list(set(browser_types))
     temp = []
-    [temp.append(i) for i in browser_types if
-     i in ['chromium', 'firefox', 'webkit']]
+    [temp.append(i.strip().lower()) for i in browser_types if
+     i.strip().lower() in ['chromium', 'firefox', 'webkit']]
     # add default value
     if len(temp) == 0:
         log.warn(