From a77bda9107caa17930cc0a561b49dcc35d8b2858 Mon Sep 17 00:00:00 2001
From: lijie <lijie@easycorp.ltd>
Date: Thu, 7 Nov 2024 16:15:55 +0800
Subject: [PATCH] [task#132160, 3h] modify function for compatible epic.

---
 .../story/test/lib/reviewstory.ui.class.php   |  8 ++--
 module/story/test/ui/reviewstory.php          | 47 +++++++++++++------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/module/story/test/lib/reviewstory.ui.class.php b/module/story/test/lib/reviewstory.ui.class.php
index 2a5e3e154b..70e2befc59 100644
--- a/module/story/test/lib/reviewstory.ui.class.php
+++ b/module/story/test/lib/reviewstory.ui.class.php
@@ -17,12 +17,12 @@ class reviewStoryTester extends tester
      * @access public
      * @return object
      */
-    public function reviewStory($result, $status)
+    public function reviewStory($storyType, $storyID, $result, $status)
     {
-        $form = $this->initForm('story', 'review', array('id' => 1), 'appIframe-product');  //进入研发评审页面
+        $form = $this->initForm($storyType, 'review', array('id' => $storyID), 'appIframe-product');  //进入研发评审页面
 
         $form->dom->result->picker($result); //选择研发评审结果
-        $form->dom->assignedTo->picker('admin'); //指派人选择admin
+        if($result != '拒绝') $form->dom->assignedTo->picker('admin'); //指派人选择admin
         $form->dom->btn($this->lang->save)->click();
         $form->wait(1);
 
@@ -33,7 +33,7 @@ class reviewStoryTester extends tester
         $viewPage->dom->btn($this->lang->story->legendLifeTime)->click();
         if($viewPage->dom->reviewer->getText() != 'admin') return $this->fail('需求评审人错误');
 
-        return $this->success('评审研发需求成功');
+        return $this->success('评审需求成功');
     }
 
     /**
diff --git a/module/story/test/ui/reviewstory.php b/module/story/test/ui/reviewstory.php
index ba6a86537a..778aa76afa 100755
--- a/module/story/test/ui/reviewstory.php
+++ b/module/story/test/ui/reviewstory.php
@@ -24,14 +24,14 @@ $product->vision->range('rnd');
 $product->gen(1);
 
 $story = zenData('story');
-$story->id->range('1-2');
-$story->root->range('1-2');
-$story->path->range('`,1,`, `,2,`');
+$story->id->range('1-6');
+$story->root->range('1-6');
+$story->path->range('1-6')->prefix(',')->postfix(',');
 $story->grade->range('1');
 $story->product->range('1');
 $story->module->range('0');
-$story->title->range('草稿研发需求1,草稿研发需求2');
-$story->type->range('story');
+$story->title->range('1-6')->prefix('草稿需求');
+$story->type->range('story{3}, epic{3}');
 $story->stage->range('wait');
 $story->status->range('reviewing');
 $story->openedBy->range('admin');
@@ -41,27 +41,44 @@ $story->reviewedBy->range('[]');
 $story->reviewedDate->range('`NULL`');
 $story->closedBy->range('[]');
 $story->closedReason->range('[]');
-$story->gen(2);
+$story->gen(6);
 
 $storyspec = zenData('storyspec');
-$storyspec->story->range('1-2');
+$storyspec->story->range('1-6');
 $storyspec->version->range('1');
-$storyspec->title->range('草稿研发需求1,草稿研发需求2');
-$storyspec->gen(1);
+$storyspec->title->range('1-6')->prefix('草稿需求');
+$storyspec->gen(6);
 
 $storyreview = zenData('storyreview');
-$storyreview->story->range('1-2');
+$storyreview->story->range('1-6');
 $storyreview->reviewer->range('admin');
 $storyreview->result->range('[]');
 $storyreview->version->range('1');
-$storyreview->gen(2);
+$storyreview->gen(6);
 
 $tester = new reviewStoryTester();
 $tester->login();
 
-$result = array('确认通过', '有待明确');
-$status = array('激活', '草稿');
+$storyType = array();
+$storyType['story']       = 'story';
+$storyType['requirement'] = 'requirement';
+$storyType['epic']        = 'epic';
+
+$storyID = array();
+$storyID['1'] = 1;
+$storyID['2'] = 2;
+$storyID['3'] = 3;
+$status = array();
+$status['active'] = '激活';
+$status['draft']  = '草稿';
+$status['closed'] = '已关闭';
+
+r($tester->reviewStory($storyType['story'], $storyID['1'], $result['pass'],    $status['active'])) && p('message') && e('评审需求成功'); //评审需求通过，研发需求状态为激活
+r($tester->reviewStory($storyType['story'], $storyID['2'], $result['clarify'], $status['draft']))  && p('message') && e('评审需求成功'); //评审需求有待明确，研发需求状态为草稿
+r($tester->reviewStory($storyType['story'], $storyID['3'], $result['reject'],  $status['closed'])) && p('message') && e('评审需求成功'); //评审需求拒绝，研发需求状态为已关闭
+
+r($tester->reviewStory($storyType['epic'], $storyID['4'], $result['pass'],    $status['active'])) && p('message') && e('评审需求成功'); //评审需求通过，业务需求状态为激活
+r($tester->reviewStory($storyType['epic'], $storyID['5'], $result['clarify'], $status['draft']))  && p('message') && e('评审需求成功'); //评审需求有待明确，业务需求状态为草稿
+r($tester->reviewStory($storyType['epic'], $storyID['6'], $result['reject'],  $status['closed'])) && p('message') && e('评审需求成功'); //评审需求拒绝，业务需求状态为已关闭
 
-r($tester->reviewStory($result[0], $status[0])) && p('message') && e('评审研发需求成功');
-r($tester->reviewStory($result[1], $status[1])) && p('message') && e('评审研发需求成功');
 $tester->closeBrowser();