From e6d618b31d0a558c3e59f2a4e20176fe268fead3 Mon Sep 17 00:00:00 2001
From: huairong <huairong@easycorp.ltd>
Date: Thu, 17 Jul 2025 10:01:45 +0800
Subject: [PATCH] + [task#146228,doing,0.1h,0.1h] Modify code.

---
 .../test/lib/createwaterfall.ui.class.php        | 11 ++++++-----
 module/project/test/ui/createwaterfall.php       | 16 +++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/module/project/test/lib/createwaterfall.ui.class.php b/module/project/test/lib/createwaterfall.ui.class.php
index c531b48e25..f8a8dd5165 100644
--- a/module/project/test/lib/createwaterfall.ui.class.php
+++ b/module/project/test/lib/createwaterfall.ui.class.php
@@ -15,9 +15,9 @@ class createWaterfallTester extends tester
         if(isset($waterfall['name'])) $form->dom->name->setValue($waterfall['name']);
         if(isset($waterfall['end']))  $form->dom->end->datePicker($waterfall['end']);
         if(isset($waterfall['PM']))   $form->dom->PM->picker($waterfall['PM']);
-        $form->wait(1);
+        $form->wait(2);
         $form->dom->btn($this->lang->save)->click();
-        $form->wait(3);
+        $form->wait(5);
         return $this->response();
     }
 
@@ -57,9 +57,10 @@ class createWaterfallTester extends tester
 
        /* 跳转到项目设置页面，点击设置菜单。 */
         $programplanPage = $this->loadPage('programplan', 'create');
+        $programplanPage->wait(4);
         $programplanPage->dom->settings->click();
-
-        $viewPage     = $this->loadPage('project', 'view');
+        $viewPage = $this->loadPage('project', 'view');
+        $viewPage->wait(4);
         $categoryLang = (array)$this->lang->project->projectTypeList;
         if($viewPage->dom->projectName->getText() != $waterfall['name'])               return $this->failed('名称错误');
         if($viewPage->dom->category->getText() != $categoryLang[$waterfall['type']])   return $this->failed('类型错误');
@@ -76,6 +77,6 @@ class createWaterfallTester extends tester
             if(isset($waterfall['end']) && $viewPage->dom->waterfallNoProductEnd->getText() != $waterfall['end']) return $this->failed('计划完成日期错误');
         }
 
-        return $this->success();
+        return $this->success('创建瀑布项目成功');
     }
 }
diff --git a/module/project/test/ui/createwaterfall.php b/module/project/test/ui/createwaterfall.php
index 170c32371a..81a1fedc54 100755
--- a/module/project/test/ui/createwaterfall.php
+++ b/module/project/test/ui/createwaterfall.php
@@ -9,17 +9,19 @@ cid=73
 
 - 校验项目名称不能为空
  - 测试结果 @创建瀑布项目表单页提示信息正确
- - 最终测试状态 @SUCCESS
+ - 最终测试状态 @ SUCCESS
 - 校验计划完成时间不能为空
  - 测试结果 @创建瀑布项目表单页提示信息正确
- - 最终测试状态 @SUCCESS
+ - 最终测试状态 @ SUCCESS
+- 校验项目名称不能重复
+ - 测试结果 @创建瀑布项目表单页提示信息正确
+ - 最终测试状态 @ SUCCESS
 - 创建长期瀑布项目最终测试状态 @SUCCESS
-- 校验项目名称不能重复测试结果 @创建瀑布项目表单页提示信息正确
 - 创建指定计划完成的瀑布项目最终测试状态 @SUCCESS
 - 创建指定计划完成的项目型瀑布项目最终测试状态 @SUCCESS
 - 创建瀑布项目后的跳转
  - 属性module @programplan
- - 属性method @create
+ - 属性method @ create
 
 */
 chdir(__DIR__);
@@ -34,8 +36,8 @@ $tester->login();
 $waterfall = array(
     array('name'   => '', 'longTime' => 'longTime', 'PM' => 'admin'),
     array('name'   => '瀑布项目h01', 'end' => ''),
+    array('name'   => '瀑布项目2', 'type' => 1, 'longTime' => 'longTime'),
     array('parent' => '项目集1', 'name' => '瀑布项目h01', 'type' => 1, 'longTime' => 'longTime'),
-    array('name'   => '瀑布项目h01', 'type' => 1, 'longTime' => 'longTime'),
     array('name'   => '瀑布项目h02', 'type' => 1, 'end' => date('Y-m-d', strtotime('+30 days')), 'PM' => 'admin'),
     array('name'   => '项目型瀑布项目h01', 'type' => 0, 'end' => date('Y-m-d', strtotime('+30 days')), 'PM' => 'admin'),
     array('name'   => '瀑布项目h03', 'end' => date('Y-m-d', strtotime('+30 days')), 'PM' => 'admin'),
@@ -43,8 +45,8 @@ $waterfall = array(
 
 r($tester->createDefault($waterfall['0'])) && p('message,status') && e('创建瀑布项目表单页提示信息正确, SUCCESS'); // 校验项目名称不能为空
 r($tester->createDefault($waterfall['1'])) && p('message,status') && e('创建瀑布项目表单页提示信息正确, SUCCESS'); // 校验计划完成时间不能为空
-r($tester->createDefault($waterfall['2'])) && p('status')         && e('SUCCESS');                                 // 创建长期瀑布项目
-r($tester->createDefault($waterfall['3'])) && p('message')        && e('创建瀑布项目表单页提示信息正确');          // 校验项目名称不能重复
+r($tester->createDefault($waterfall['2'])) && p('message,status') && e('创建瀑布项目表单页提示信息正确, SUCCESS'); // 校验项目名称不能重复
+r($tester->createDefault($waterfall['3'])) && p('status')         && e('SUCCESS');                                 // 创建长期瀑布项目
 r($tester->createDefault($waterfall['4'])) && p('status')         && e('SUCCESS');                                 // 创建指定计划完成的瀑布项目
 r($tester->createDefault($waterfall['5'])) && p('status')         && e('SUCCESS');                                 // 创建指定计划完成的项目型瀑布项目
 r($tester->checkLocating($waterfall['6'])) && p('module,method')  && e('programplan, create');                     // 创建瀑布项目后的跳转