Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch release/21.7.2 of zentao/zentaopms (#9557)

Browse Source
This commit is contained in:
刘刚
2025-06-17 08:33:12 +08:00
committed by Gitfox
parent c40305fe89 33d3417dc0
commit c86bc90fa9
10 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/test/lib/confirmbug.ui.class.php
+3 -3
View File
@@ -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成功');
module/bug/test/ui/editbug.php
+6 -4
View File
@@ -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();
module/bug/test/ui/page/browse.php
+2 -1
View File
@@ -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);
module/testcase/test/lib/testcase.ui.class.php
+2 -1
View File
@@ -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))
{
module/testcase/test/ui/automation.php
+2 -2
View File
@@ -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'); //验证自动化测试设置
r($tester->automation($url, $automation)) && p('message,status') && e('验证自动化测试设置成功,SUCCESS'); //验证自动化测试设置
$tester->closeBrowser();
module/testcase/test/ui/batchedittestcase.php
-1
View File
@@ -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);
module/testcase/test/ui/edittestcase.php
-1
View File
@@ -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);
module/testcase/test/ui/exporttestcase.php
+2 -2
View File
@@ -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'); //验证导出测试用例
r($tester->exportTestcase($url, $testcase)) && p('message,status') && e('导出测试用例成功,SUCCESS'); //验证导出测试用例
$tester->closeBrowser();
module/testcase/test/ui/page/browse.php
+3 -2
View File
@@ -15,9 +15,10 @@ 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);
}
}
}
module/testcase/test/ui/zerocase.php
+2 -2
View File
@@ -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);
@@ -54,4 +53,5 @@ $url = array(
'objectID' => 0
);
r($tester->zeroCase($url)) && p('message,status') && e('验证零用例需求列表成功,SUCCESS'); //验证验证零用例需求列表
r($tester->zeroCase($url)) && p('message,status') && e('验证零用例需求列表成功,SUCCESS'); //验证验证零用例需求列表
$tester->closeBrowser();