diff --git a/module/execution/test/lib/dynamic.ui.class.php b/module/execution/test/lib/dynamic.ui.class.php index 69e6a4d314..b135ba8fe0 100644 --- a/module/execution/test/lib/dynamic.ui.class.php +++ b/module/execution/test/lib/dynamic.ui.class.php @@ -13,6 +13,9 @@ class dynamicTester extends tester public function checkTotalNum($num) { $form = $this->initForm('execution', 'dynamic', array('execution' => '3'), 'appIframe-execution'); + $form->wait(1); + $form->dom->allTab->click(); + $form->wait(1); if($form->dom->num->getText() != $num) return $this->failed('执行动态数量不正确'); return $this->success('执行动态数量正确'); } @@ -29,6 +32,7 @@ class dynamicTester extends tester public function checkNumByUser($user, $num) { $form = $this->initForm('execution', 'dynamic', array('execution' => '3', 'user' => $user), 'appIframe-execution'); + $form->wait(1); $form->dom->user->picker($user); $form->wait(1); if(count($form->dom->getElementList($form->dom->xpath['detailNum'])->element) != $num) return $this->failed('按用户筛选动态数据错误'); diff --git a/module/execution/test/ui/grouptask.php b/module/execution/test/ui/grouptask.php index ebc915e93c..dd812998e5 100644 --- a/module/execution/test/ui/grouptask.php +++ b/module/execution/test/ui/grouptask.php @@ -108,6 +108,8 @@ $taskSpec->version->range('0'); $taskSpec->name->range('1-100'); $taskSpec->gen(12); +zenData('taskteam')->gen(0); + $tester = new grouptaskTester(); $tester->login(); diff --git a/module/execution/test/ui/page/dynamic.php b/module/execution/test/ui/page/dynamic.php index 3c578ee660..6cb6674207 100644 --- a/module/execution/test/ui/page/dynamic.php +++ b/module/execution/test/ui/page/dynamic.php @@ -5,7 +5,8 @@ class dynamicPage extends page { parent::__construct($webdriver); $xpath = array( - 'num' => "//*[@id='featureBar']/menu/li[2]/a/span[2]", + 'allTab' => "//*[@id='featureBar']/menu/li[1]/a/span[1]", + 'num' => "//*[@id='featureBar']/menu/li[1]/a/span[2]", 'detailNum' => "//*[@id='mainContent']/div/div/ul/li/div[2]/div/ul/li" ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); diff --git a/module/execution/test/ui/taskexecution.php b/module/execution/test/ui/taskexecution.php index 05f50da904..cb07664a16 100755 --- a/module/execution/test/ui/taskexecution.php +++ b/module/execution/test/ui/taskexecution.php @@ -93,6 +93,8 @@ $taskSpec->version->range('0'); $taskSpec->name->range('1-100'); $taskSpec->gen(12); +zenData('taskteam')->gen(0); + $action = zenData('action'); $action->id->range('1,2'); $action->objectType->range('task'); diff --git a/module/execution/test/ui/testtask.php b/module/execution/test/ui/testtask.php index 10fdf95f43..703cccc348 100644 --- a/module/execution/test/ui/testtask.php +++ b/module/execution/test/ui/testtask.php @@ -2,7 +2,7 @@