From 1e60d650a4968125c7ec756ceed5ad6fd9d8e2d3 Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:22:25 +0800 Subject: [PATCH 1/8] *[task#146146,doing,1h,3h]switchtab function --- .../test/lib/switchtabinlite.ui.class.php | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 module/projectstory/test/lib/switchtabinlite.ui.class.php diff --git a/module/projectstory/test/lib/switchtabinlite.ui.class.php b/module/projectstory/test/lib/switchtabinlite.ui.class.php new file mode 100755 index 0000000000..d29ae4a3ca --- /dev/null +++ b/module/projectstory/test/lib/switchtabinlite.ui.class.php @@ -0,0 +1,34 @@ +switchVision('lite'); + $form = $this->initForm('projectstory', 'story', $projectID, 'appIframe-project'); + $numDom = $tabName . 'Num'; + $tabLang = [ + 'allTab' => '全部', + 'openTab' => '未关闭', + 'draftTab' => '草稿', + 'reviewingTab' => '评审中', + 'changingTab' => '变更中' + ]; + $form->wait(1); + $form->dom->$tabName->click(); + $form->wait(1); + $num = $form->dom->$numDom->getText(); + return ($num == $expectNum) + ? $this->success("{$tabLang[$tabName]}Tab下数据显示正确") + : $this->success("{$tabLang[$tabName]}Tab下数据显示不正确"); + } +} From 87fd57a327d3324e43e8da60bca899d43f7ed08e Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:24:20 +0800 Subject: [PATCH 2/8] *[task#146146,doing,0.5h,3h]xpath of storyTab --- module/projectstory/test/ui/page/story.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/module/projectstory/test/ui/page/story.php b/module/projectstory/test/ui/page/story.php index 240fb251aa..157eada956 100755 --- a/module/projectstory/test/ui/page/story.php +++ b/module/projectstory/test/ui/page/story.php @@ -37,7 +37,18 @@ class storyPage extends page 'assignedTo' => "//*[@data-name='assignedTo']/div/div", 'assignBtn' => "//*[@class='panel-body']/form/div[3]/div/button", 'batchAssignBtn' => "//*[@id='stories']/div[3]/nav/button[4]/span[1]", - 'assignToAdmin' => "//*[@class='item-content']/div" + 'assignToAdmin' => "//*[@class='item-content']/div", + /* 运营管理界面 */ + 'allTab' => '//*[@data-id="allstory"]', + 'openTab' => '//*[@data-id="unclosed"]', + 'draftTab' => '//*[@data-id="draft"]', + 'reviewingTab' => '//*[@data-id="reviewing"]', + 'changingTab' => '//*[@data-id="changing"]', + 'allTabNum' => '//*[@data-id="allstory"]/span[2]', + 'openTabNum' => '//*[@data-id="unclosed"]/span[2]', + 'draftTabNum' => '//*[@data-id="draft"]/span[2]', + 'reviewingTabNum' => '//*[@data-id="reviewing"]/span[2]', + 'changingTabNum' =>'//*[@data-id="changing"]/span[2]' ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); } From 652cab5943a4546067c37e877684032dff71318b Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:25:37 +0800 Subject: [PATCH 3/8] *[task#146146,doing,0.5h,3h]zendata of project --- .../projectstory/test/ui/switchtabinlite.php | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 module/projectstory/test/ui/switchtabinlite.php diff --git a/module/projectstory/test/ui/switchtabinlite.php b/module/projectstory/test/ui/switchtabinlite.php new file mode 100755 index 0000000000..51754964c9 --- /dev/null +++ b/module/projectstory/test/ui/switchtabinlite.php @@ -0,0 +1,49 @@ +#!/usr/bin/env php +id->range('1'); +$project->model->range('kanban'); +$project->type->range('project'); +$project->name->range('运营项目'); +$project->hasProduct->range('0'); +$project->acl->range('open'); +$project->vision->range('lite'); +$project->gen(1); + +$product = zenData('product'); +$product->id->range('1'); +$product->program->range('0'); +$product->name->range('运营项目'); +$product->shadow->range('1'); +$product->type->range('normal'); +$product->acl->range('open'); +$product->vision->range('lite'); +$product->gen(1); + +$tester->closeBrowser(); From 61a8e9a8ca8f6fb6765f59f9bd85599bbc7983f8 Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:26:31 +0800 Subject: [PATCH 4/8] *[task#146146,doing,0.5h,3h]zendata --- .../projectstory/test/ui/switchtabinlite.php | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/module/projectstory/test/ui/switchtabinlite.php b/module/projectstory/test/ui/switchtabinlite.php index 51754964c9..0f4ec7148b 100755 --- a/module/projectstory/test/ui/switchtabinlite.php +++ b/module/projectstory/test/ui/switchtabinlite.php @@ -46,4 +46,52 @@ $product->acl->range('open'); $product->vision->range('lite'); $product->gen(1); +$projectproduct = zenData('projectproduct'); +$projectproduct->project->range('1'); +$projectproduct->product->range('1'); +$projectproduct->branch->range('0'); +$projectproduct->plan->range('0'); +$projectproduct->gen(1); + +$team = ZenData('team'); +$team->id->range('1'); +$team->root->range('1'); +$team->type->range('project'); +$team->account->range('admin'); +$team->gen(1); + +$story = ZenData('story'); +$story->id->range('1-12'); +$story->vision->range('lite'); +$story->parent->range('0'); +$story->isparent->range('0'); +$story->root->range('1-12'); +$story->path->range('1-12'); +$story->product->range('1'); +$story->title->range('目标01,目标02,目标03,目标04,目标05,目标06,目标07,目标08,目标09,目标10,目标11,目标12'); +$story->type->range('story'); +$story->status->range('closed{2},active,changing,reviewing{6},draft{2}'); +$story->stage->range('closed{2},projected{10}'); +$story->version->range('1'); +$story->openedBy->range('admin'); +$story->assignedTo->range('closed{2},{10}'); +$story->changedBy->range('{3},admin,{8}'); +$story->reviewedBy->range('admin{3},{9}'); +$story->closedBy->range('admin{2},{10}'); +$story->closedReason->range('done{2},{10}'); +$story->deleted->range('0'); +$story->gen(12); + +$storyspec = ZenData('storyspec'); +$storyspec->story->range('1-12'); +$storyspec->version->range('1'); +$storyspec->title->range('目标01,目标02,目标03,目标04,目标05,目标06,目标07,目标08,目标09,目标10,目标11,目标12'); +$storyspec->gen(12); + +$storyreview = ZenData('storyreview'); +$storyreview->story->range('1-12'); +$storyreview->version->range('1'); +$storyreview->reviewer->range('admin'); +$storyreview->result->range('pass{4},{8}'); +$storyreview->gen(12); $tester->closeBrowser(); From f9fd48df8ec7eb54d65b7f7ee73763707010cc1e Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:28:09 +0800 Subject: [PATCH 5/8] *[task#146146,done,1h,0h]zendata and uitestcase --- .../projectstory/test/ui/switchtabinlite.php | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/module/projectstory/test/ui/switchtabinlite.php b/module/projectstory/test/ui/switchtabinlite.php index 0f4ec7148b..c9ac4cde66 100755 --- a/module/projectstory/test/ui/switchtabinlite.php +++ b/module/projectstory/test/ui/switchtabinlite.php @@ -94,4 +94,28 @@ $storyreview->version->range('1'); $storyreview->reviewer->range('admin'); $storyreview->result->range('pass{4},{8}'); $storyreview->gen(12); + +$action = zenData('action'); +$action->id->range('1-37'); +$action->objectType->range('product,project,story{35}'); +$action->objectID->range('1{3},2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,11,12,11,12,1{2},2{2},3{2},4{3},1,2'); +$action->product->range('1'); +$action->project->range('0,1,0{10},1{10},0{2},1{13}'); +$action->execution->range('0'); +$action->actor->range('admin{27},系统,admin,系统,admin,系统,admin,系统,admin{3}'); +$action->action->range('opened{12},linked2project{10},opened{2},linked2project{2},reviewed,reviewpassed,reviewed,reviewpassed,reviewed,reviewpassed,reviewed,reviewpassed,changed,closed{2}'); +$action->extra->range('{12},1{10},{2},1{2},Pass,pass|draft,Pass,pass|draft,Pass,pass|draft,Pass,pass|draft,{1},Done|active{2}'); +$action->vision->range('lite'); +$action->gen(37); + +$projectID = array('projectID' => '1'); +$tester = new switchTab(); +$tester->login(); + +r($tester->switchTab($projectID, 'allTab', '12')) && p('message,status') && e('全部Tab下数据显示正确,SUCCESS');//检查全部Tab +r($tester->switchTab($projectID, 'openTab', '10')) && p('message,status') && e('未关闭Tab下数据显示正确,SUCCESS');//检查未关闭Tab +r($tester->switchTab($projectID, 'draftTab', '2')) && p('message,status') && e('草稿Tab下数据显示正确,SUCCESS');//检查草稿Tab +r($tester->switchTab($projectID, 'reviewingTab', '6')) && p('message,status') && e('评审中Tab下数据显示正确,SUCCESS');//检查评审中Tab +r($tester->switchTab($projectID, 'changingTab', '1')) && p('message,status') && e('变更中Tab下数据显示正确,SUCCESS');//检查变更中Tab + $tester->closeBrowser(); From 217485bc001107e37e519fcd6ff6b3ca35b1e2f9 Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:31:53 +0800 Subject: [PATCH 6/8] *[task#146146,doing,0.1h,0h]code style --- module/projectstory/test/ui/switchtabinlite.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/projectstory/test/ui/switchtabinlite.php b/module/projectstory/test/ui/switchtabinlite.php index c9ac4cde66..95fbe04bb3 100755 --- a/module/projectstory/test/ui/switchtabinlite.php +++ b/module/projectstory/test/ui/switchtabinlite.php @@ -112,10 +112,10 @@ $projectID = array('projectID' => '1'); $tester = new switchTab(); $tester->login(); -r($tester->switchTab($projectID, 'allTab', '12')) && p('message,status') && e('全部Tab下数据显示正确,SUCCESS');//检查全部Tab -r($tester->switchTab($projectID, 'openTab', '10')) && p('message,status') && e('未关闭Tab下数据显示正确,SUCCESS');//检查未关闭Tab -r($tester->switchTab($projectID, 'draftTab', '2')) && p('message,status') && e('草稿Tab下数据显示正确,SUCCESS');//检查草稿Tab -r($tester->switchTab($projectID, 'reviewingTab', '6')) && p('message,status') && e('评审中Tab下数据显示正确,SUCCESS');//检查评审中Tab -r($tester->switchTab($projectID, 'changingTab', '1')) && p('message,status') && e('变更中Tab下数据显示正确,SUCCESS');//检查变更中Tab +r($tester->switchTab($projectID, 'allTab', '12')) && p('message,status') && e('全部Tab下数据显示正确,SUCCESS');//检查全部Tab +r($tester->switchTab($projectID, 'openTab', '10')) && p('message,status') && e('未关闭Tab下数据显示正确,SUCCESS');//检查未关闭Tab +r($tester->switchTab($projectID, 'draftTab', '2')) && p('message,status') && e('草稿Tab下数据显示正确,SUCCESS');//检查草稿Tab +r($tester->switchTab($projectID, 'reviewingTab', '6')) && p('message,status') && e('评审中Tab下数据显示正确,SUCCESS');//检查评审中Tab +r($tester->switchTab($projectID, 'changingTab', '1')) && p('message,status') && e('变更中Tab下数据显示正确,SUCCESS');//检查变更中Tab $tester->closeBrowser(); From 214aaf71cc95e1ec1555e21635f59550ed0cfc81 Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 14:39:07 +0800 Subject: [PATCH 7/8] *[task#146146,doing,0.1h,0h] --- module/projectstory/test/lib/switchtabinlite.ui.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/projectstory/test/lib/switchtabinlite.ui.class.php b/module/projectstory/test/lib/switchtabinlite.ui.class.php index d29ae4a3ca..e3c4cf6db3 100755 --- a/module/projectstory/test/lib/switchtabinlite.ui.class.php +++ b/module/projectstory/test/lib/switchtabinlite.ui.class.php @@ -29,6 +29,6 @@ class switchTab extends tester $num = $form->dom->$numDom->getText(); return ($num == $expectNum) ? $this->success("{$tabLang[$tabName]}Tab下数据显示正确") - : $this->success("{$tabLang[$tabName]}Tab下数据显示不正确"); + : $this->failed("{$tabLang[$tabName]}Tab下数据显示不正确"); } } From d7eb198c54b508e78eea5241b2224175f996900a Mon Sep 17 00:00:00 2001 From: lixiaoyu Date: Fri, 4 Jul 2025 16:22:40 +0800 Subject: [PATCH 8/8] *[task#146146,done,0.1h,0h] --- module/projectstory/test/lib/switchtabinlite.ui.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/projectstory/test/lib/switchtabinlite.ui.class.php b/module/projectstory/test/lib/switchtabinlite.ui.class.php index e3c4cf6db3..316fb88df2 100755 --- a/module/projectstory/test/lib/switchtabinlite.ui.class.php +++ b/module/projectstory/test/lib/switchtabinlite.ui.class.php @@ -14,8 +14,8 @@ class switchTab extends tester public function switchTab($projectID, $tabName, $expectNum) { $this->switchVision('lite'); - $form = $this->initForm('projectstory', 'story', $projectID, 'appIframe-project'); - $numDom = $tabName . 'Num'; + $form = $this->initForm('projectstory', 'story', $projectID, 'appIframe-project'); + $numDom = $tabName . 'Num'; $tabLang = [ 'allTab' => '全部', 'openTab' => '未关闭',