浏览代码

update test case

wangweimin 4 年之前
父节点
当前提交
8024298d41
共有 2 个文件被更改,包括 29 次插入26 次删除
  1. 16 1
      test/13.misc.py
  2. 13 25
      test/template.py

+ 16 - 1
test/13.misc.py

@@ -1,3 +1,4 @@
+import re
 import subprocess
 from functools import partial
 
@@ -108,6 +109,19 @@ def target():
     scoped_func('text1 from `scoped_func`')
     scoped_func('text2 from `scoped_func`')
 
+    put_tabs([
+        {'title': 'Text', 'content': 'Hello world'},
+        {'title': 'Markdown', 'content': put_markdown('~~Strikethrough~~')},
+        {'title': 'More content', 'content': [
+            put_table([
+                ['Commodity', 'Price'],
+                ['Apple', '5.5'],
+                ['Banana', '7'],
+            ]),
+            put_link('pywebio', 'https://github.com/wang0618/PyWebIO')
+        ]},
+    ])
+
     try:
         put_column([put_text('A'), 'error'])
     except Exception:
@@ -200,7 +214,8 @@ def test(server_proc: subprocess.Popen, browser: Chrome):
     thread_out = template.save_output(browser)[-1]
 
     assert "ToastClicked" in coro_out
-    assert coro_out == thread_out
+    # Eliminate the effects of put_tabs
+    assert re.sub(r'"webio-.*?"', '', coro_out) == re.sub(r'"webio-.*?"', '', thread_out)
     browser.execute_script("WebIO._state.CurrentSession.ws.close()")
     time.sleep(6)
 

+ 13 - 25
test/template.py

@@ -296,18 +296,6 @@ def basic_output():
     hobby.append(put_text('Music'), put_text('Drama'))
     hobby.insert(0, put_markdown('**Coding**'))
 
-    put_tabs([
-        {'title': 'Text', 'content': 'Hello world'},
-        {'title': 'Markdown', 'content': put_markdown('~~Strikethrough~~')},
-        {'title': 'More content', 'content': [
-            put_table([
-                ['Commodity', 'Price'],
-                ['Apple', '5.5'],
-                ['Banana', '7'],
-            ]),
-            put_link('pywebio', 'https://github.com/wang0618/PyWebIO')
-        ]},
-    ])
 
 
 def background_output():
@@ -601,11 +589,11 @@ def test_input(browser: Chrome, enable_percy=False):
         template.background_input() # 或者 await template.coro_background_input() / flask_coro_background_input
 
     """
-    browser.find_element_by_css_selector('input').send_keys("22")
+    browser.find_element_by_css_selector('#input-container input').send_keys("22")
     browser.find_element_by_tag_name('form').submit()
 
     time.sleep(0.5)
-    browser.find_element_by_css_selector('input').send_keys("secret")
+    browser.find_element_by_css_selector('#input-container input').send_keys("secret")
     browser.find_element_by_tag_name('form').submit()
 
     time.sleep(0.5)
@@ -613,23 +601,23 @@ def test_input(browser: Chrome, enable_percy=False):
 
     # checkbox
     time.sleep(0.5)
-    browser.execute_script("arguments[0].click();", browser.find_element_by_css_selector('input'))
+    browser.execute_script("arguments[0].click();", browser.find_element_by_css_selector('#input-container input'))
     browser.find_element_by_tag_name('form').submit()
 
     # Text Area
     time.sleep(0.5)
-    browser.find_element_by_css_selector('textarea').send_keys(" ".join(str(i) for i in range(20)))
+    browser.find_element_by_css_selector('#input-container textarea').send_keys(" ".join(str(i) for i in range(20)))
     browser.find_element_by_tag_name('form').submit()
 
     # file
     time.sleep(0.5)
     img_path = path.join(here_dir, 'assets', 'img.png')
-    browser.find_element_by_css_selector('input').send_keys(img_path)
+    browser.find_element_by_css_selector('#input-container input').send_keys(img_path)
     browser.find_element_by_tag_name('form').submit()
 
     # text
     time.sleep(0.5)
-    browser.find_element_by_css_selector('input').send_keys("text")
+    browser.find_element_by_css_selector('#input-container input').send_keys("text")
     browser.find_element_by_tag_name('form').submit()
 
     # 表单取消
@@ -638,15 +626,15 @@ def test_input(browser: Chrome, enable_percy=False):
 
     # valid func, age in [10, 60]
     time.sleep(0.5)
-    browser.find_element_by_css_selector('input').send_keys("1")
+    browser.find_element_by_css_selector('#input-container input').send_keys("1")
     browser.find_element_by_tag_name('form').submit()
     time.sleep(0.5)
-    browser.find_element_by_css_selector('input').clear()
-    browser.find_element_by_css_selector('input').send_keys("90")
+    browser.find_element_by_css_selector('#input-container input').clear()
+    browser.find_element_by_css_selector('#input-container input').send_keys("90")
     browser.find_element_by_tag_name('form').submit()
     time.sleep(0.5)
-    browser.find_element_by_css_selector('input').clear()
-    browser.find_element_by_css_selector('input').send_keys("23")
+    browser.find_element_by_css_selector('#input-container input').clear()
+    browser.find_element_by_css_selector('#input-container input').send_keys("23")
     browser.find_element_by_tag_name('form').submit()
 
     # code
@@ -717,11 +705,11 @@ def test_input(browser: Chrome, enable_percy=False):
 
     # background
     time.sleep(3)
-    get_visible_form(browser).find_element_by_css_selector('input').send_keys("background")
+    get_visible_form(browser).find_element_by_css_selector('#input-container input').send_keys("background")
     get_visible_form(browser).find_element_by_tag_name('form').submit()
     # front
     time.sleep(0.5)
-    get_visible_form(browser).find_element_by_css_selector('input').send_keys("front")
+    get_visible_form(browser).find_element_by_css_selector('#input-container input').send_keys("front")
     get_visible_form(browser).find_element_by_tag_name('form').submit()