From 1aa52594e395085aaa93bdf4e544373a8cc997c8 Mon Sep 17 00:00:00 2001 From: yulujie Date: Tue, 10 Jun 2025 10:13:25 +0800 Subject: [PATCH] *[uitest] Modify xpath. --- module/testtask/test/ui/runcase.php | 2 +- module/tree/test/lib/browse.ui.class.php | 7 ++++--- module/tree/test/ui/browse.php | 4 ++-- module/tree/test/ui/page/browse.php | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/module/testtask/test/ui/runcase.php b/module/testtask/test/ui/runcase.php index 4577bf1a86..eca9904f79 100755 --- a/module/testtask/test/ui/runcase.php +++ b/module/testtask/test/ui/runcase.php @@ -66,7 +66,7 @@ $case->id->range('1-100'); $case->project->range('1{2}, 0{100}'); $case->product->range('1{10}, 2{5}'); $case->execution->range('0{5}, 2{10}'); -$case->story->range(''); +$case->story->range('0'); $case->title->range('1-100'); $case->stage->range('feature'); $case->status->range('normal,blocked,investigate,normal{100}'); diff --git a/module/tree/test/lib/browse.ui.class.php b/module/tree/test/lib/browse.ui.class.php index a88c3d8299..298268adeb 100755 --- a/module/tree/test/lib/browse.ui.class.php +++ b/module/tree/test/lib/browse.ui.class.php @@ -24,7 +24,8 @@ class browseTester extends tester if($form->dom->modalText->getText() == sprintf($this->lang->tree->repeatName, $moduleName)) return $this->success('创建模块时模块已存在，提示正确'); return $this->failed('创建模块时模块已存在，提示错误'); } - if(preg_match('/\s/', $moduleName)) + /* 当模块名只有空白字符时 */ + if(ctype_space($moduleName)) { if($form->dom->modalText->getText() == $this->lang->tree->shouldNotBlank) return $this->success('创建模块时模块名包含空格，提示正确'); return $this->failed('创建模块时模块名包含空格，提示错误'); @@ -61,7 +62,7 @@ class browseTester extends tester if($form->dom->modalText->getText() == sprintf($this->lang->tree->repeatName, $childModuleName)) return $this->success('创建子模块时子模块已存在，提示正确'); return $this->failed('创建子模块时子模块已存在，提示错误'); } - if(preg_match('/\s/', $childModuleName)) + if(ctype_space($childModuleName)) { if($form->dom->modalText->getText() == $this->lang->tree->shouldNotBlank) return $this->success('创建子模块时子模块名包含空格，提示正确'); return $this->failed('创建子模块时子模块名包含空格，提示错误'); @@ -100,7 +101,7 @@ class browseTester extends tester if($form->dom->nameTip->getText() == sprintf($this->lang->tree->repeatName, $newName)) return $this->success('编辑模块时模块已存在，提示正确'); return $this->failed('编辑模块时模块已存在，提示错误'); } - if(preg_match('/\s/', $newName)) + if(ctype_space($newName)) { if(!is_object($form->dom->modalText)) return $this->failed('编辑模块时模块名包含空格，没有提示'); if($form->dom->modalText->getText() == $this->lang->tree->shouldNotBlank) return $this->success('编辑模块时模块名包含空格，提示正确'); diff --git a/module/tree/test/ui/browse.php b/module/tree/test/ui/browse.php index 42f93a85bd..cf7eed9a5a 100755 --- a/module/tree/test/ui/browse.php +++ b/module/tree/test/ui/browse.php @@ -40,11 +40,11 @@ $story->gen(1); $tester = new browseTester(); $tester->login(); -r($tester->createModule('模块 1')) && p('status,message') && e('SUCCESS,创建模块时模块名包含空格空，提示正确'); +r($tester->createModule(' ')) && p('status,message') && e('SUCCESS,创建模块时模块名包含空格空，提示正确'); r($tester->createModule('模块1')) && p('status,message') && e('SUCCESS,创建模块成功'); r($tester->createModule('模块1', true)) && p('status,message') && e('SUCCESS,创建模块时模块已存在，提示正确'); r($tester->createModule('模块2')) && p('status,message') && e('SUCCESS,创建模块成功'); -r($tester->createChildModule('子模块 1')) && p('status,message') && e('SUCCESS,创建子模块时子模块名包含空格，提示正确'); +r($tester->createChildModule(' ')) && p('status,message') && e('SUCCESS,创建子模块时子模块名包含空格，提示正确'); r($tester->createChildModule('子模块1')) && p('status,message') && e('SUCCESS,创建子模块成功'); r($tester->createChildModule('模块2')) && p('status,message') && e('SUCCESS,创建子模块成功'); r($tester->createChildModule('子模块1', true)) && p('status,message') && e('SUCCESS,创建子模块时子模块已存在，提示正确'); diff --git a/module/tree/test/ui/page/browse.php b/module/tree/test/ui/page/browse.php index e27ead1cef..9eca72373b 100755 --- a/module/tree/test/ui/page/browse.php +++ b/module/tree/test/ui/page/browse.php @@ -19,7 +19,7 @@ class browsePage extends page 'firstViewBtn' => "//*[@id='treeEditor-tree-browse']/li[1]/div/nav/a[3]", 'firstCaret' => "//*[@id='treeEditor-tree-browse']/li/div/span/span", /* 删除确认弹窗中元素 */ - 'modalText' => "//div[contains(@class,'modal-body')]//div[text()!='']", + 'modalText' => "//div[contains(@class,'modal-body')]", 'modalConfirm' => "//button[@z-key='confirm']", /* 编辑弹窗中元素 */ 'editSubmitBtn' => "//*[@id='zin_tree_edit_form']//button[@type='submit']",