From 055669c1eac9530d582b76a7e48407eb209c1f90 Mon Sep 17 00:00:00 2001
From: yulujie <yulujie@easycorp.ltd>
Date: Mon, 28 Oct 2024 14:39:45 +0800
Subject: [PATCH] * [uitest] Fix bug.

---
 module/execution/test/lib/editexecution.ui.class.php  | 7 ++++---
 module/execution/test/lib/managemembers.ui.class.php  | 1 +
 module/execution/test/lib/startexecution.ui.class.php | 2 +-
 module/execution/test/lib/story.ui.class.php          | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/execution/test/lib/editexecution.ui.class.php b/module/execution/test/lib/editexecution.ui.class.php
index be3a6822df..ab0f1260da 100644
--- a/module/execution/test/lib/editexecution.ui.class.php
+++ b/module/execution/test/lib/editexecution.ui.class.php
@@ -23,6 +23,7 @@ class editExecutionTester extends tester
         if(isset($execution['products'])) $form->dom->products->picker($execution['products']);
         $form->dom->submit->click();
         $form->wait(1);
+        return $form;
     }
 
     /**
@@ -35,14 +36,14 @@ class editExecutionTester extends tester
      */
     public function edit($execution)
     {
-        $this->editFields($execution);
+        $form = $this->editFields($execution);
         /* 根据编辑弹窗中的保存按钮是否存在，判断是否编辑成功 */
         if($form->dom->submit === true) return $this->failed("编辑执行失败");
         /* 查看相关内容是否正确 */
         $viewPage = $this->loadPage('execution', 'view');
-        if(isset($execution['name']) && ($viewPage->dom->executionName->getText() != $execution['name'])) return $this->failed('编辑后执行名称错误');
+        if(isset($execution['name']) && ($viewPage->dom->executionName->getText() != $execution['name']))  return $this->failed('编辑后执行名称错误');
         if(isset($execution['begin']) && ($viewPage->dom->plannedBegin->getText() != $execution['begin'])) return $this->failed('编辑后计划开始时间错误');
-        if(isset($execution['end']) && ($viewPage->dom->plannedEnd->getText() != $execution['end'])) return $this->failed('编辑后计划完成时间错误');
+        if(isset($execution['end']) && ($viewPage->dom->plannedEnd->getText() != $execution['end']))       return $this->failed('编辑后计划完成时间错误');
         return $this->success('编辑执行成功');
     }
 }
diff --git a/module/execution/test/lib/managemembers.ui.class.php b/module/execution/test/lib/managemembers.ui.class.php
index e6309a430c..6fc40a9e63 100755
--- a/module/execution/test/lib/managemembers.ui.class.php
+++ b/module/execution/test/lib/managemembers.ui.class.php
@@ -54,6 +54,7 @@ class manageMembersTester extends tester
         $form = $this->initForm('execution', 'team', array('execution' => $execution['id']), 'appIframe-execution');
         $numBefore = $form->dom->num->getText();
         $form->dom->firstRemoveBtn->click();
+        $form->wait(1);
         $form->dom->alertModal();
         $form->wait(1);
         $numAfter = $form->dom->num->getText();
diff --git a/module/execution/test/lib/startexecution.ui.class.php b/module/execution/test/lib/startexecution.ui.class.php
index 465ff60215..d58147c6ae 100644
--- a/module/execution/test/lib/startexecution.ui.class.php
+++ b/module/execution/test/lib/startexecution.ui.class.php
@@ -53,7 +53,7 @@ class startExecutionTester extends tester
         $form  = $this->loadPage();
         $field = $form->dom->realBeganField->getText();
         $text  = $form->dom->realBeganTip->getText();
-        $info  = sprintf($lang->error->le, $field, $realBegan);
+        $info  = sprintf($this->lang->error->le, $field, $realBegan);
         if($text != $info) return $this->success('开始执行表单页提示信息正确');
         return $this->failed('开始执行表单页提示信息不正确');
     }
diff --git a/module/execution/test/lib/story.ui.class.php b/module/execution/test/lib/story.ui.class.php
index 2e85c2d10e..ec6520ec1b 100755
--- a/module/execution/test/lib/story.ui.class.php
+++ b/module/execution/test/lib/story.ui.class.php
@@ -117,7 +117,9 @@ class storyTester extends tester
     {
         $form = $this->initForm('execution', 'story', array('execution' => '2'), 'appIframe-execution');
         $form->dom->firstAssignTo->click();
+        $form->wait(1);
         $form->dom->assignedTo->picker($user);
+        $form->wait(1);
         $form->dom->submitBtn->click();
         $form->wait(1);
 
@@ -137,6 +139,7 @@ class storyTester extends tester
     {
         $form = $this->initForm('execution', 'story', array('execution' => '2'), 'appIframe-execution');
         $form->dom->firstCheckbox->click();
+        $form->wait(1);
         $form->dom->batchAssignBtn->click();
         $form->wait(1);
         $form->dom->assignToAdmin->click();