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

This commit is contained in:
李阳
2025-07-18 17:18:20 +08:00
committed by Gitfox
9 changed files with 9 additions and 18 deletions
@@ -60,8 +60,7 @@ class activateExecutionTester extends tester
*/
public function activateWithLessEnd($end, $executionId)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$this->inputFields($end, $executionId);
$form = $this->loadPage();
$form->wait(1);
@@ -58,8 +58,7 @@ class closeExecutionTester extends tester
*/
public function closeWithGreaterDate($realEnd, $executionId)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$this->inputFields($realEnd, $executionId);
$form = $this->loadPage();
$field = $form->dom->realEndField->getText();
@@ -88,8 +88,7 @@ class createExecutionTester extends tester
*/
public function create($execution, $module = 'execution')
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$this->inputFields($execution);
/* 创建成功会跳转至看板列表全部标签下,从url中获取status字段内容 */
@@ -88,8 +88,7 @@ class editExecutionTester extends tester
*/
public function edit($execution)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$this->inputFields($execution);
if($this->checkFormTips('execution')) return $this->success('编辑看板表单页提示信息正确');
@@ -15,8 +15,7 @@ class kanbanTester extends tester
*/
public function checkKanban($col, $num, $groupId = '', $lane = '1')
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$form = $this->initForm('execution', 'kanban', array('kanbanID' => '2'), 'appIframe-project');
$form->wait(1);
@@ -36,8 +36,7 @@ class putoffExecutionTester extends tester
*/
public function putoff($execution, $executionId)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$this->inputFields($execution, $executionId);
$form = $this->loadPage();
$form->wait(1);
@@ -54,8 +54,7 @@ class startExecutionTester extends tester
*/
public function startWithGreaterDate($realBegan, $kanbanId)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$this->inputFields($realBegan, $kanbanId);
$form = $this->loadPage();
$field = $form->dom->realBegan->getValue();
@@ -12,8 +12,7 @@ class suspendExecutionTester extends tester
*/
public function suspend($executionId)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$form = $this->initForm('execution', 'kanban', array('execution' => $executionId ), 'appIframe-project');
$form->wait(1);
$form->dom->kanbanSettingInLite->click();
@@ -13,8 +13,7 @@ class taskExecutionTester extends tester
*/
public function checkTab($tab, $expectNum)
{
$this->switchVision('lite');
$this->page->wait(5)->refresh();
$this->switchVision('lite', 5);
$form = $this->initForm('execution', 'task', array('execution' => '2'), 'appIframe-project');
$form->wait(1);
$params = array('allTab', 'unclosedTab', 'myTab', 'involvedTab', 'assignedByMeTab', 'changedByMeTab');