From 13f55c5d896ea53f93bb9431588c1f6a7edfe8a2 Mon Sep 17 00:00:00 2001
From: lixiaoyu <lixiaoyu@easycorp.ltd>
Date: Tue, 22 Jul 2025 16:20:26 +0800
Subject: [PATCH] *[task#146787,doing,1h,3h] modify close program

---
 .../test/lib/deleteprogram.ui.class.php       | 24 +++++++++----------
 module/program/test/ui/deleteprogram.php      |  7 +++---
 module/program/test/ui/page/browse.php        |  4 +++-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/module/program/test/lib/deleteprogram.ui.class.php b/module/program/test/lib/deleteprogram.ui.class.php
index 32d4ea5ae3..27047737c1 100755
--- a/module/program/test/lib/deleteprogram.ui.class.php
+++ b/module/program/test/lib/deleteprogram.ui.class.php
@@ -5,25 +5,23 @@ class createProgramTester extends tester
     /**
      * 删除项目集。
      *
-     * @param  string $programName
-     * @param  array  $whitelist
+     * @param  string $num
      * @access public
      * @return void
      */
-    public function deleteProgram($programName)
+    public function deleteProgram($num)
     {
-        /*删除列表第一个项目集*/
         $this->openUrl('program', 'browse');
         $browsePage = $this->loadPage('program', 'browse');
+        $browsePage->dom->allTab->click();
+        $browsePage->wait(2);
         $browsePage->dom->fstdeleteBtn->click();
-        $browsePage->dom->undeleteConfirm->click();
-        $browsePage->dom->fstdeleteBtn->click();
-        $browsePage->dom->deleteConfirm->click();
-        $browsePage->wait(1);
-        $browsePage->dom->search(array("项目集名称,=,{$programName->name}"));
-        $browsePage->wait(1);
-
-        if($browsePage->dom->formText->getText() != '暂时没有项目集') return $this->failed('删除项目集失败');
-        return $this->success('删除项目集成功');
+        $browsePage->wait(2);
+        $browsePage->dom->confirm->click();
+        $browsePage->wait(2);
+        $allTabNum = $browsePage->dom->allTabNum->getText();//全部tab旁的数字
+        return ($num == $allTabNum)
+            ? $this->success('删除项目集成功')
+            : $this->failed('删除项目集失败');
     }
 }
diff --git a/module/program/test/ui/deleteprogram.php b/module/program/test/ui/deleteprogram.php
index 04dfb27c7d..2be7ad596e 100755
--- a/module/program/test/ui/deleteprogram.php
+++ b/module/program/test/ui/deleteprogram.php
@@ -5,6 +5,7 @@
 
 title=删除项目集测试
 timeout=0
+cid=0
 
 - 删除项目集，删除成功
  - 测试结果 @删除项目集成功
@@ -26,8 +27,6 @@ $program->gen(2);
 $tester = new createProgramTester();
 $tester->login();
 
-$programName = new stdClass();
-$programName->name = '项目集1';
-
-r($tester->deleteProgram($programName)) && p('message,status') && e('删除项目集成功,SUCCESS'); //删除项目集成功
+$num = '1';
+r($tester->deleteProgram($num)) && p('message,status') && e('删除项目集成功,SUCCESS'); //删除项目集成功
 $tester->closeBrowser();
diff --git a/module/program/test/ui/page/browse.php b/module/program/test/ui/page/browse.php
index bbec561b6b..87fc8422ad 100644
--- a/module/program/test/ui/page/browse.php
+++ b/module/program/test/ui/page/browse.php
@@ -23,10 +23,12 @@ class browsePage extends page
             'deleteCancel'    => '//*[@class="modal modal-async load-indicator modal-alert modal-trans show in"]/div/div[1]/div[3]/nav/button[2]',
             'deleteConfirm'   => '//*[@class="modal modal-async load-indicator modal-alert modal-trans show in"]/div/div[1]/div[3]/nav/button[1]',
             'undeleteConfirm' => '//*[@class="modal-content"]/div[3]/nav/button[2]',
+            'confirm'         => '//button[@z-key="confirm"]',
             'formText'        => '//*[@id="projectviews"]/div/div/div',
             'fstProgramName'  => '/html/body/div[1]/div/div[2]/div[2]/div/div[2]/div[1]/div/div/div/a',
             'addProject'      => '/html/body/div[1]/div/div[1]/div[2]/a[1]',
-            'allTab'          => '//*[@id="mainMenu"]/div[1]/menu[1]/li[1]/a[1]'
+            'allTab'          => '//*[@id="mainMenu"]/div[1]/menu[1]/li[1]/a[1]',
+            'allTabNum'       => '//*[@id="featureBar"]/menu/li[1]/a/span[2]'
         );
         $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
     }