diff --git a/module/execution/test/lib/editinlite.ui.class.php b/module/execution/test/lib/editinlite.ui.class.php index 1423416917..79257193c1 100755 --- a/module/execution/test/lib/editinlite.ui.class.php +++ b/module/execution/test/lib/editinlite.ui.class.php @@ -16,6 +16,7 @@ class editExecutionTester extends tester $form->dom->kanbanSettingInLite->click(); $form->wait(); $form = $this->loadPage(); + $form->wait(1); $form->dom->btn($this->lang->execution->setKanban)->click(); $form->wait(1); if(isset($execution['name'])) $form->dom->name->setValue($execution['name']); @@ -94,8 +95,8 @@ class editExecutionTester extends tester /* 访问view方法,方便获取信息 */ $form = $this->initForm('execution', 'view', array('kanbanID' => '2' ), 'appIframe-project'); if(isset($execution['name']) && $form->dom->executionName->getText() != $execution['name']) return $this->failed('编辑看板名称失败'); - if(isset($execution['begin']) && $form->dom->plannedBegin->getText() != $execution['begin']) return $this->failed('编辑预计开始日期失败'); - if(isset($execution['end']) && $form->dom->plannedEnd->getText() != $execution['end']) return $this->failed('编辑预计结束日期失败'); + if(isset($execution['begin']) && $form->dom->plannedBeginInLite->getText() != $execution['begin']) return $this->failed('编辑预计开始日期失败'); + if(isset($execution['end']) && $form->dom->plannedEndInLite->getText() != $execution['end']) return $this->failed('编辑预计结束日期失败'); return $this->success('编辑看板成功'); } @@ -112,6 +113,7 @@ class editExecutionTester extends tester $this->switchVision('lite'); $this->inputFields($execution); $form = $this->loadPage(); + $form->wait(1); $text = $form->dom->nameTip->getText(); $info = sprintf($this->lang->error->notempty, $this->lang->kanban->name); if($text == $info) return $this->success('编辑看板表单页提示信息正确'); diff --git a/module/execution/test/ui/editinlite.php b/module/execution/test/ui/editinlite.php index c8de26093f..2dd820eef7 100755 --- a/module/execution/test/ui/editinlite.php +++ b/module/execution/test/ui/editinlite.php @@ -31,7 +31,20 @@ $project->status->range('wait'); $project->vision->range('lite'); $project->gen(3); -zenData('projectproduct')->gen(0); +$product = zenData('product'); +$product->id->range('1-100'); +$product->name->range('项目'); +$product->shadow->range('1'); +$product->bind->range('1'); +$product->type->range('normal'); +$product->vision->range('lite'); +$product->gen(1); + +$projectProduct = zenData('projectproduct'); +$projectProduct->project->range('1-3'); +$projectProduct->product->range('1'); +$projectProduct->plan->range('0'); +$projectProduct->gen(3); $tester = new editExecutionTester(); $tester->login(); diff --git a/module/execution/test/ui/page/view.php b/module/execution/test/ui/page/view.php index 4d42165964..2133ea3ef7 100755 --- a/module/execution/test/ui/page/view.php +++ b/module/execution/test/ui/page/view.php @@ -48,6 +48,9 @@ class viewPage extends page 'putoffSubmit' => "//*[@class='modal-actions']/../div[3]/div/div/form/div[4]/div/button", /* 激活执行弹窗中的元素 */ 'activateSubmit' => "//*[@class='modal-actions']/../div[3]/div/div/form/div[3]/div/button", + /* 运营管理界面下元素 */ + 'plannedBeginInLite' => "//*[@id='mainContent']/div[2]/div[1]/div/table[2]/tbody/tr/td/div/div[1]/span[2]", + 'plannedEndInLite' => "//*[@id='mainContent']/div[2]/div[1]/div/table[2]/tbody/tr/td/div/div[2]/span[2]", ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); }