UI自动化关键字及用例调整

2021-05-13 14:15:40 +08:00
parent 0ac0b90ad7
commit 52e72067ff
7 changed files with 42 additions and 38 deletions
--- a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot
@@ -141,10 +141,6 @@ DecryptionKeyringsDownload
    # TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[4]/div/button[1]
    # ...    //*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[4]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
    
-DecryptionKeyringsCertificateExpired
-    [Tags]    Positive    UI    Settings    DecryptionKeyrings
-    DecryptionKeyringsErrorVerification    ${TEST NAME}    ${path}keyrings//root//zcwca-cer.pem    ${path}keyrings//root//zcwca-key.pem    certificateType_select0    keyringsadd_publicKeyAlgoSelet1    /html/body/div[last()]/p    Certificate expired
-
 DecryptionKeyringsCertificateExpirationDelay
    [Tags]    Positive    UI    Settings    DecryptionKeyrings
    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[2]    xpath
@@ -230,6 +226,10 @@ DecryptionKeyringsNameCreateSpecialChar
    CreateDecryptionKeyrings    ВставкаСкриптов!@#$%^&(-+=‘；。，？    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
    DeleteKeyrings_del
+    
+DecryptionKeyringsCertificateExpired
+    [Tags]    Negtive    UI    Settings    DecryptionKeyrings
+    DecryptionKeyringsErrorVerification    ${TEST NAME}    ${path}keyrings//root//zcwca-cer.pem    ${path}keyrings//root//zcwca-key.pem    certificateType_select0    keyringsadd_publicKeyAlgoSelet1    /html/body/div[last()]/p    Certificate expired

 DecryptionKeyringsCARootFileCAMiddleType
    [Tags]    Negtive    UI    Settings    DecryptionKeyrings
--- a/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
@@ -89,7 +89,7 @@ ResponsePagesSpecialFileName
 ResponsePagesCreateNullNames
    [Tags]    Negtive    UI    Name    Settings    ResponsePages
    OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
-    click    id=respinseAdd  
+    click    id=responseAdd
    sleep     ${sleep_min}
    Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input    ${path}response_pages_files\\Create-ResponsePages-test.html    #上传文件
    sleep    ${sleep}
@@ -105,7 +105,7 @@ ResponsePageUploadNullFile
 ResponsePageUploadExceed20MFile
    [Tags]    Negtive    UI    File    Settings    ResponsePages
    OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
-    click    id=respinseAdd
+    click    id=responseAdd
    sleep     ${sleep_min}
    Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input    ${path}response_pages_files\\Exceed20MFile.html
    sleep     ${sleep_min}
--- a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
@@ -51,7 +51,7 @@ SSLFingerprintImportUserAgentExceedFour
    CreateSSLFingerprint    b32309a26951912be7dba376398abc3b    No    JA3Hash    Description=test
    ${ID}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/div/span
    SSLFingerprintImportUserAgent    ${ID}    ${path}SSLFingerprint_files/UserAgent.json    4    Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.2; Win64; x64; Trident/5.0)
-    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[3]/div/div/div[1]/div/div/div[1]/div/form/div[2]/div/div[1]
+    ...    /html/body/div[4]/div/div[1]/div/div/div[1]/div/form/div[2]/div/div[1]
    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr
    DeleteSSLFingerprint

@@ -80,7 +80,7 @@ SSLFingerprintDownloadExample
    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[5]    Targeting=xpath
    click    id=objectImport
    sleep     ${sleep_min}
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/form/div[1]/div/div/div[2]/span
+    click    xpath=/html/body/div/div/div[1]/div/div/div[1]/div/form/div[1]/div/div/div[2]/span
    sleep    ${sleep}
    Should_Exist    ${Downloadpath}JA3 hash import example.csv
    Remove File    ${Downloadpath}JA3 hash import example.csv
@@ -204,7 +204,7 @@ SSLFingerprintCreateRepeatJA3Hash

 SSLFingerprintImportNoJsonFile
    [Tags]    Negtive    UI    Settings    SSLFingerprint
-    UploadFilesSize    SSLFingerprint    1     ${path}SSLFingerprint_files/NoJsonFile.txt    Only json formats can be uploaded
+    UploadFilesSize    SSLFingerprint    1     ${path}SSLFingerprint_files/NoJsonFile.txt    Please upload the file.
    
 SSLFingerprintImportEmptyJsonFile
    [Tags]    Negtive    UI    Settings    SSLFingerprint
@@ -226,9 +226,9 @@ SSLFingerprintImportRepeatJA3
    [Tags]    Negtive    UI    Settings    SSLFingerprint
    CreateSSLFingerprint    d8c87baaaaaaaaaaaa9e41242626c2f3    Yes    JA3Hash    Description=test
    SSLFingerprintImportJA3    ${path}SSLFingerprint_files/InportSSLFingerprint.csv
-    ${text}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
+    ${text}    Get Text    xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
    Should Be Equal As Strings    ${text}    JA3 Hash repeat
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[2]/div[2]/button
+    click    xpath=/html/body/div/div/div[1]/div/div/div[2]/div[2]/button
    sleep     ${sleep_min}
    Settings-Search    d8c87baaaaaaaaaaaa9e41242626c2f3    JA3Hash
    sleep     ${sleep_min}
@@ -239,12 +239,16 @@ SSLFingerprintImportJA3FormatError
    [Tags]    Negtive    UI    Settings    SSLFingerprint
    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[5]    Targeting=xpath
    SSLFingerprintImportJA3    ${path}SSLFingerprint_files/SSL_FingerprintFormatError.csv
-    ${text}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
+    ${text}    Get Text    xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
    Should Be Equal As Strings    ${text}    JA3 Hash format error
+    click    xpath=/html/body/div/div/div[1]/div/div/div[2]/div[2]/button
+    sleep     ${sleep_min}
    
 SSLFingerprintImportJA3PinningError
    [Tags]    Negtive    UI    Settings    SSLFingerprint
    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[5]    Targeting=xpath
    SSLFingerprintImportJA3    ${path}SSLFingerprint_files/SSL_FingerprintPinningError.csv
-    ${text}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
-    Should Be Equal As Strings    ${text}    Pinning error
+    ${text}    Get Text    xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
+    Should Be Equal As Strings    ${text}    Pinning error
+    click    xpath=/html/body/div/div/div[1]/div/div/div[2]/div[2]/button
+    sleep     ${sleep_min}