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

Merge branch release/21.7.3 of zentao/zentaopms (#10421)

Browse Source
This commit is contained in:
李阳
2025-07-17 14:18:05 +08:00
committed by Gitfox
parent b27e641a00 6899dc727c
commit eaf31234f5
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/test/lib/changestoryinlite.ui.class.php
+5 -1
View File
@@ -25,7 +25,11 @@ class changeStoryInLiteTester extends tester
$form = $this->initForm('projectstory', 'story', array('projectID' => '1'), 'appIframe-project'); //变更目标前需要进入列表页面，获取项目ID
$form = $this->initForm('story', 'change', array('storyID' => '1', 'from' => 'project'), 'appIframe-project');
$form->dom->title->setValue($storyName);
$form->dom->{'reviewer[]'}->multiPicker($reviewer);
if($reviewer != NULL)
{
$form->dom->reviewer->click();
$form->dom->reviewerAdmin->click();
}
$form->dom->btn($this->lang->save)->click();
$form->wait(3);
module/story/test/lib/createstoryinlite.ui.class.php
+6 -1
View File
@@ -35,10 +35,15 @@ class createStoryInLiteTester extends tester
);
$form = $this->switchVision('lite');
$form->page->wait(2)->refresh();
$form = $this->initForm('projectstory', 'story', array('projectID' => '1'), 'appIframe-project'); //由于创建目标后会跳转到记录了session的页面，所以先进入一次对应目标的列表页面
$form = $this->initForm('story', 'create', $createStoryParam, 'appIframe-project'); //再进入创建目标页面
$form->dom->titleInLite->setValue($storyName);
$form->dom->{'reviewer[]'}->multiPicker($reviewer);
if($reviewer != NULL)
{
$form->dom->reviewer->click();
$form->dom->reviewerAdmin->click();
}
$form->dom->saveInLite->click();
$form->wait(1);
module/story/test/ui/page/change.php
+3 -1
View File
@@ -6,7 +6,9 @@ class changePage extends page
parent::__construct($webdriver);
$xpath = array(
'srCommon' => "//*[@id='dataform']/div[1]/div/div[1]/div[1]/div[2]/div[1]"
'srCommon' => "//*[@id='dataform']/div[1]/div/div[1]/div[1]/div[2]/div[1]",
/*运营界面*/
'reviewerAdmin' => "//*[@class='pick-container']//menu//a/div/div[text()='admin']"
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
module/story/test/ui/page/create.php
+2 -1
View File
@@ -9,7 +9,8 @@ class createPage extends page
/*运营界面创建目标页面*/
'srCommen' => "//*[@id='zin_story_create_form']/div[3]/div[1]/label/span",
'titleInLite' => "//*[@id='title']",
'saveInLite' => "//*[@id='zin_story_create_form']/div[8]/div/button[1]"
'saveInLite' => "//*[@id='zin_story_create_form']/div[8]/div/button[1]",
'reviewerAdmin' => "//*[@class='pick-container']//menu/menu/li/a/div/div[text()='admin']",
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}