select 更新

tests/test_cases/test_gsjd.py

@@ -8,19 +8,25 @@ URL1 = '''http://{host}/cm'''
 params1 = {
     'host' : HOST
 }
+caseId_scdb='温平检刑捕受[2020]33032600562号'
+caseId_scqs='瓯检起诉受[2020]33030400557号'
+caseName_scdb='陈庆涉嫌故意伤害案'
+caseName_scqs='陈小秋诈骗案'
+
 
 @pytest.mark.select
 @get_engine(__file__,url=URL1.format(**params1))
 def test_full_select(engine):
     # engine.get_page(engine.INDEXURL)
+
     for i in ['审查逮捕','审查起诉']:
+        case_id = caseId_scdb if i == '审查逮捕' else caseId_scqs
         scdb = engine.driver.xpath(f"//span[text()='{i}']/..")[0]
         if scdb:
             scdb.click()
         else:
             engine.logger.error(f'{i}元素获取错误')
             return
-        case_id = engine.get_caseId(f'caseId_{i}')
         input = engine.driver.xpath("//input[@id='ajmc']")[0]
         if input:
             input.send_keys(case_id)
@@ -45,13 +51,15 @@ def test_full_select(engine):
 def test_sub_select(engine):
     # engine.get_page(engine.INDEXURL)
     for i in ['审查逮捕','审查起诉']:
+        case_id = caseId_scdb if i == '审查逮捕' else caseId_scqs
+        case_id = case_id[11:-2]
         scdb = engine.driver.xpath(f"//span[text()='{i}']/..")[0]
         if scdb:
             scdb.click()
         else:
             engine.logger.error(f'{i}元素获取错误')
             return
-        case_id = engine.get_caseId(f'caseId_{i}')[11:-2]
+
         input = engine.driver.xpath("//input[@id='ajmc']")[0]
         if input:
             input.send_keys(case_id)
@@ -75,13 +83,14 @@ def test_sub_select(engine):
 def test_null_select(engine):
     # engine.get_page(engine.INDEXURL)
     for i in ['审查逮捕','审查起诉']:
+
         scdb = engine.driver.xpath(f"//span[text()='{i}']/..")[0]
         if scdb:
             scdb.click()
         else:
             engine.logger.error(f'{i}元素获取错误')
             return
-        case_id = engine.get_caseId(f'caseId_{i}')[11:-2]
+        # case_id = engine.get_caseId(f'caseId_{i}')[11:-2]
         anjian_list = [anjian.get_attribute('data-row-key') for anjian in engine.driver.xpath("//tbody[@class='ant-table-tbody']/tr")]
         select = engine.driver.xpath("//button[@type='submit']")[0]
         if select:
@@ -102,13 +111,14 @@ def test_null_select(engine):
 def test_fullname_select(engine):
     # engine.get_page(engine.INDEXURL)
     for i in ['审查逮捕','审查起诉']:
+        case_name = caseName_scdb if i == '审查逮捕' else caseName_scqs
         scdb = engine.driver.xpath(f"//span[text()='{i}']/..")[0]
         if scdb:
             scdb.click()
         else:
             engine.logger.error(f'{i}元素获取错误')
             return
-        case_name = engine.get_caseId(f'caseName_{i}')
+        # case_name = engine.get_caseId(f'caseName_{i}')
         input = engine.driver.xpath("//input[@id='ajmc']")[0]
         if input:
             input.send_keys(case_name)
@@ -134,13 +144,15 @@ def test_fullname_select(engine):
 def test_subname_select(engine):
     # engine.get_page(engine.INDEXURL)
     for i in ['审查逮捕','审查起诉']:
+        case_name = caseName_scdb if i == '审查逮捕' else caseName_scqs
+        case_name = case_name[:3]
         scdb = engine.driver.xpath(f"//span[text()='{i}']/..")[0]
         if scdb:
             scdb.click()
         else:
             engine.logger.error(f'{i}元素获取错误')
             return
-        case_name = engine.get_caseId(f'caseName_{i}')[:3]
+        # case_name = engine.get_caseId(f'caseName_{i}')[:3]
         input = engine.driver.xpath("//input[@id='ajmc']")[0]
         if input:
             input.send_keys(case_name)

tests/test_cases/test_login.py

@@ -81,7 +81,7 @@ def test_login_pwerr(engine):
     alert_message_list = engine.driver.xpath('//div[@class="main___2iu6s"]//span[@class="ant-alert-message"]')
     assert form_explain_list ==[]
     assert alert_message_list ==[]
-    engine.load_image()
+    # engine.load_image()
     engine.driver.xpath('//*[@id="username"]')[0].send_keys(username)
     # engine.driver.find_element_by_xpath('//*[@id="password"]').send_keys('123')
     engine.driver.xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button')[0].click()