diff --git a/test/ui/product/createproduct.class.php b/test/ui/product/createproduct.class.php index 8f8c7dfa10..5631e21d73 100644 --- a/test/ui/product/createproduct.class.php +++ b/test/ui/product/createproduct.class.php @@ -12,27 +12,26 @@ class createProductTester extends tester { $this->login(); $createPage = $this->loadPage('product', 'create'); - $createPage->name->setValue('正常产品'); + $createPage->name->setValue('正常产品' . time()); return $createPage->submit(); } public function createDefault() { - $name = '默认产品'; + $name = '默认产品' . time(); $this->login(); $createPage = $this->loadPage('product', 'create'); $createPage->name->setValue($name); - $result = $createPage->submit(); - - if($result->status != 'SUCCESS') return $result; + $createPage->submit(); $browsePage = $this->setPage('product', 'browse'); $browsePage->settings->click(); $viewPage = $this->setPage('product', 'view'); - if($viewPage->name != $name) return failed('名称错误'); - if($viewPage->acl != '私有') return failed('权限错误'); + if($viewPage->productName->getText() != $name) return failed('名称错误'); + if($viewPage->type->getText() != '正常') return failed('类型错误'); + if($viewPage->acl->getText() != '公开') return failed('权限错误'); return success('SUCCESS'); } diff --git a/test/ui/product/page/create.php b/test/ui/product/page/create.php index 2730d1f6ee..754817502f 100644 --- a/test/ui/product/page/create.php +++ b/test/ui/product/page/create.php @@ -13,8 +13,10 @@ class createPage extends Page public function submit() { - global $lang; - $this->btn($lang->product->addBtn)->click(); + global $lang, $result; + $this->btn($lang->product->saveBtn)->click(); + sleep(1); + $result->getPageInfo(); return $this; } diff --git a/test/ui/product/page/view.php b/test/ui/product/page/view.php index 68e14b1af2..ba1a15aa34 100644 --- a/test/ui/product/page/view.php +++ b/test/ui/product/page/view.php @@ -6,7 +6,9 @@ class viewPage extends Page parent::__construct(); $doms = array( - 'settings' => "//*[@id='navbar']//a[@data-id='settings']/span", + 'productName' => "//*[@id='mainContent']/div[1]/div[1]/div[1]/div[2]/div[1]/div", + 'type' => "//*[@id='mainContent']/div[1]/div[1]/div[1]/div[2]/div[1]/span[2]", + 'acl' => "//*[@id='mainContent']/div[1]/div[1]/div[1]/div[2]/div[1]/span[3]", ); $this->doms = array_merge($this->doms, $doms); }