From 3f9f937f13796bde6b314246d16927a43eddd7b3 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:01:52 +0800 Subject: [PATCH 01/12] *[misc] Optimize edit bug UI script logic. --- module/bug/test/lib/confirmbug.ui.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/bug/test/lib/confirmbug.ui.class.php b/module/bug/test/lib/confirmbug.ui.class.php index e67ddf375f..c01720f5eb 100755 --- a/module/bug/test/lib/confirmbug.ui.class.php +++ b/module/bug/test/lib/confirmbug.ui.class.php @@ -155,12 +155,12 @@ class confirmBugTester extends tester { $this->login(); $list = $this->initForm('bug', 'browse', $product, 'appIframe-qa'); - $this->webdriver->wait(1); + $this->webdriver->wait(3); $bugTitle = $list->dom->bugTitle->getText(); $list->dom->editButton->click(); - $this->webdriver->wait(1); + $this->webdriver->wait(3); if(isset($bug['bugName'])) $list->dom->title->setValue($bug['bugName']); - $list->dom->btn($this->lang->save)->click(); + $list->dom->saveButton->click(); $this->webdriver->wait(3); if($this->response('method') == 'view') return $this->success('编辑bug成功'); From e678b60ef6015d3006a900d2df72bd7ab94c7d1f Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:03:20 +0800 Subject: [PATCH 02/12] *[misc] Optimize test data in edit bug Ui script. --- module/bug/test/ui/editbug.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/module/bug/test/ui/editbug.php b/module/bug/test/ui/editbug.php index 75868e2965..b0af94d8fb 100755 --- a/module/bug/test/ui/editbug.php +++ b/module/bug/test/ui/editbug.php @@ -19,13 +19,15 @@ cid=1 */ zenData('product')->loadYaml('product')->gen(1); $story = zenData('story'); -$story->id->setFields(array(array('range' => '2'))); -$story->version->setFields(array(array('range' => '1'))); +$story->id->range('2'); +$story->version->range('1'); $story->gen(1); zenData('project')->loadYaml('execution')->gen(1); $bug = zenData('bug'); -$bug->project->range('1'); -$bug->execution->range('1'); +$bug->project->range('0'); +$bug->product->range('1'); +$bug->module->range('0'); +$bug->execution->range('0'); $bug->openedBuild->range('trunk'); $bug->gen(1); $tester = new confirmBugTester(); From 3957bcd7e8f908ac4dc41dd1df6f91bb194bef55 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:03:56 +0800 Subject: [PATCH 03/12] *[misc] Add save button xpath in page browse. --- module/bug/test/ui/page/browse.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/bug/test/ui/page/browse.php b/module/bug/test/ui/page/browse.php index 317aea995d..c781932c44 100755 --- a/module/bug/test/ui/page/browse.php +++ b/module/bug/test/ui/page/browse.php @@ -23,7 +23,8 @@ class browsePage extends page 'bugStatus' => "//div[@data-col='status' and @data-type='status']/div/span[text()]", 'closeComment' => "//zen-editor[@id='comment']", 'resolve' => "//span[text()='解决']", - 'batchEdit' => "//span[text()='编辑']" + 'batchEdit' => "//span[text()='编辑']", + 'saveButton' => "//span[text()='保存']" ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); From 8b4e0be2336188ba1ccb1a2234b7f12384f8e351 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:27:07 +0800 Subject: [PATCH 04/12] *[misc] Optimize test data logic in automation UI script. --- module/testcase/test/ui/automation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testcase/test/ui/automation.php b/module/testcase/test/ui/automation.php index 4e7408bf8e..c9c636b650 100755 --- a/module/testcase/test/ui/automation.php +++ b/module/testcase/test/ui/automation.php @@ -40,7 +40,6 @@ $story->openedBy->range('admin'); $story->version->range('1'); $story->assignedTo->range('[]'); $story->reviewedBy->range('[]'); -$story->reviewedDate->range('`NULL`'); $story->closedBy->range('[]'); $story->closedReason->range('[]'); $story->gen(2); @@ -65,4 +64,5 @@ $automation = array( 'scriptPath' => '/var/www/html/bin', 'shell' => '/var/www/html/bin/xxcPackage.sh' ); -r($tester->automation($url, $automation)) && p('message,status') && e('验证自动化测试设置成功,SUCCESS'); //验证自动化测试设置 \ No newline at end of file +r($tester->automation($url, $automation)) && p('message,status') && e('验证自动化测试设置成功,SUCCESS'); //验证自动化测试设置 +$tester->closeBrowser(); \ No newline at end of file From 579f20217d55581b99ec406cdbdb6af179801a11 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:51:47 +0800 Subject: [PATCH 05/12] *[misc] Optimize logic in batch create case UI script. --- module/testcase/test/lib/testcase.ui.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/testcase/test/lib/testcase.ui.class.php b/module/testcase/test/lib/testcase.ui.class.php index 7a06c54014..4b1364cf07 100755 --- a/module/testcase/test/lib/testcase.ui.class.php +++ b/module/testcase/test/lib/testcase.ui.class.php @@ -178,7 +178,8 @@ class testcase extends tester $this->login(); $form = $this->initForm('testcase', 'browse', $url, 'appIframe-qa'); $form->dom->caseAllLabel->click(); - $form->dom->btn($this->lang->edit)->click(); + $this->webdriver->wait(2); + $form->dom->batchEdit->click(); $counter = 0; if(!empty($testcases)) { From f8ef2aa7e11946ade744d8cdf3b0be16feea7c9f Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:52:54 +0800 Subject: [PATCH 06/12] *[misc] Optimize test data in batch create case UI script. --- module/testcase/test/ui/batchedittestcase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/testcase/test/ui/batchedittestcase.php b/module/testcase/test/ui/batchedittestcase.php index 55d86cfa46..08f2d8c581 100755 --- a/module/testcase/test/ui/batchedittestcase.php +++ b/module/testcase/test/ui/batchedittestcase.php @@ -40,7 +40,6 @@ $story->openedBy->range('admin'); $story->version->range('1'); $story->assignedTo->range('[]'); $story->reviewedBy->range('[]'); -$story->reviewedDate->range('`NULL`'); $story->closedBy->range('[]'); $story->closedReason->range('[]'); $story->gen(2); From 07cd6d596ead5971a79b27b210175db80de551e8 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 18:53:36 +0800 Subject: [PATCH 07/12] *[misc] Add batch edit button xpath in page browse. --- module/testcase/test/ui/page/browse.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/testcase/test/ui/page/browse.php b/module/testcase/test/ui/page/browse.php index fc06d1887d..38e75d19bb 100755 --- a/module/testcase/test/ui/page/browse.php +++ b/module/testcase/test/ui/page/browse.php @@ -15,7 +15,8 @@ class browsePage extends page 'save' => "//button[@type='submit']", 'exportMenu' => "//button[@type='button' and contains(@zui-toggle-dropdown,'export')]/i", 'exportCaseButton' => "//menu/li/a[contains(@href,'=export&')]", - 'automation' => "//a[contains(@href,'automation')]" + 'automation' => "//a[contains(@href,'automation')]", + 'batchEdit' => "//span[text()='编辑'] ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); From 486e6957cbcfc51d8c8eebfe99953d30dea6bf76 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 19:07:47 +0800 Subject: [PATCH 08/12] *[misc] Optimize test data logic in edit testcase UI script. --- module/testcase/test/ui/edittestcase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/testcase/test/ui/edittestcase.php b/module/testcase/test/ui/edittestcase.php index a5cf402209..f82f0ebf76 100755 --- a/module/testcase/test/ui/edittestcase.php +++ b/module/testcase/test/ui/edittestcase.php @@ -40,7 +40,6 @@ $story->openedBy->range('admin'); $story->version->range('1'); $story->assignedTo->range('[]'); $story->reviewedBy->range('[]'); -$story->reviewedDate->range('`NULL`'); $story->closedBy->range('[]'); $story->closedReason->range('[]'); $story->gen(2); From e1b57da6e40a795015a4098f318882c12ffd25da Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 19:41:34 +0800 Subject: [PATCH 09/12] *[misc] Add edit button in page browse. --- module/testcase/test/ui/page/browse.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testcase/test/ui/page/browse.php b/module/testcase/test/ui/page/browse.php index 38e75d19bb..11c225c54b 100755 --- a/module/testcase/test/ui/page/browse.php +++ b/module/testcase/test/ui/page/browse.php @@ -16,9 +16,9 @@ class browsePage extends page 'exportMenu' => "//button[@type='button' and contains(@zui-toggle-dropdown,'export')]/i", 'exportCaseButton' => "//menu/li/a[contains(@href,'=export&')]", 'automation' => "//a[contains(@href,'automation')]", - 'batchEdit' => "//span[text()='编辑'] + 'batchEdit' => "//span[text()='编辑']" ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); } -} +} \ No newline at end of file From 681d9f2866c2d32cdc19b2d986b2bf2485ddd814 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 19:42:13 +0800 Subject: [PATCH 10/12] *[misc] Optimize test data logic in export testcase UI script. --- module/testcase/test/ui/exporttestcase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testcase/test/ui/exporttestcase.php b/module/testcase/test/ui/exporttestcase.php index 807ca47bb1..14d8e9a053 100755 --- a/module/testcase/test/ui/exporttestcase.php +++ b/module/testcase/test/ui/exporttestcase.php @@ -40,7 +40,6 @@ $story->openedBy->range('admin'); $story->version->range('1'); $story->assignedTo->range('[]'); $story->reviewedBy->range('[]'); -$story->reviewedDate->range('`NULL`'); $story->closedBy->range('[]'); $story->closedReason->range('[]'); $story->gen(2); @@ -77,4 +76,5 @@ $testcase = array( 'encode' => 'GBK', 'exportType' => '全部记录' ); -r($tester->exportTestcase($url, $testcase)) && p('message,status') && e('导出测试用例成功,SUCCESS'); //验证导出测试用例 \ No newline at end of file +r($tester->exportTestcase($url, $testcase)) && p('message,status') && e('导出测试用例成功,SUCCESS'); //验证导出测试用例 +$tester->closeBrowser(); \ No newline at end of file From d2a71add6345ee251fcf9d88b0ed5e2d9ad5c445 Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 19:48:58 +0800 Subject: [PATCH 11/12] *[misc] Optimize test data logic in zerocase UI script. --- module/testcase/test/ui/zerocase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/testcase/test/ui/zerocase.php b/module/testcase/test/ui/zerocase.php index c39e2f3b02..9485bceab2 100755 --- a/module/testcase/test/ui/zerocase.php +++ b/module/testcase/test/ui/zerocase.php @@ -40,7 +40,6 @@ $story->openedBy->range('admin'); $story->version->range('1'); $story->assignedTo->range('[]'); $story->reviewedBy->range('[]'); -$story->reviewedDate->range('`NULL`'); $story->closedBy->range('[]'); $story->closedReason->range('[]'); $story->gen(2); From 33d3417dc051d3b56ef0b16abb89621770a0b21e Mon Sep 17 00:00:00 2001 From: luxuyang Date: Mon, 16 Jun 2025 19:50:42 +0800 Subject: [PATCH 12/12] *[misc] Optimize test data logic in zerocase UI script. --- module/testcase/test/ui/zerocase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/testcase/test/ui/zerocase.php b/module/testcase/test/ui/zerocase.php index 9485bceab2..94abec8e19 100755 --- a/module/testcase/test/ui/zerocase.php +++ b/module/testcase/test/ui/zerocase.php @@ -53,4 +53,5 @@ $url = array( 'objectID' => 0 ); -r($tester->zeroCase($url)) && p('message,status') && e('验证零用例需求列表成功,SUCCESS'); //验证验证零用例需求列表 \ No newline at end of file +r($tester->zeroCase($url)) && p('message,status') && e('验证零用例需求列表成功,SUCCESS'); //验证验证零用例需求列表 +$tester->closeBrowser(); \ No newline at end of file