diff --git a/module/project/test/lib/activeproject.ui.class.php b/module/project/test/lib/activeproject.ui.class.php index aa753e37d1..f564a85444 100644 --- a/module/project/test/lib/activeproject.ui.class.php +++ b/module/project/test/lib/activeproject.ui.class.php @@ -11,7 +11,7 @@ class activeprojectTester extends tester */ public function activeProject(array $project) { - $form = $this->initForm('project', 'browse','appIframe-project'); + $form = $this->initForm('project', 'browse', 'appIframe-project'); $featureBar = (array)$this->lang->project->featureBar; $featureBar['browse'] = (array)$featureBar['browse']; $form->dom->btn($featureBar['browse']['more'])->click(); diff --git a/module/project/test/lib/closeproject.ui.class.php b/module/project/test/lib/closeproject.ui.class.php index 5328867e15..3a88ad0b0a 100644 --- a/module/project/test/lib/closeproject.ui.class.php +++ b/module/project/test/lib/closeproject.ui.class.php @@ -11,7 +11,7 @@ class closeprojectTester extends tester */ public function closeProject(array $project) { - $form = $this->initForm('project', 'browse','appIframe-project'); + $form = $this->initForm('project', 'browse', 'appIframe-project'); $featureBar = (array)$this->lang->project->featureBar; $featureBar['browse'] = (array)$featureBar['browse']; $form->dom->btn($featureBar['browse']['wait'])->click(); diff --git a/module/project/test/lib/editwaterfall.ui.class.php b/module/project/test/lib/editwaterfall.ui.class.php index 914453b0a6..d6ca1b270e 100644 --- a/module/project/test/lib/editwaterfall.ui.class.php +++ b/module/project/test/lib/editwaterfall.ui.class.php @@ -11,7 +11,7 @@ class editWaterfallTester extends tester */ public function editWaterfall(array $waterfall) { - $form = $this->initForm('project', 'edit', array('projecID' => 5),'appIframe-project'); + $form = $this->initForm('project', 'edit', array('projecID' => 5), 'appIframe-project'); $form->dom->name->setValue($waterfall['name']); $form->wait(1); $form->dom->btn($this->lang->save)->click(); diff --git a/module/project/test/ui/activeproject.php b/module/project/test/ui/activeproject.php index 1f05ceeaf6..3cec7ec2cb 100755 --- a/module/project/test/ui/activeproject.php +++ b/module/project/test/ui/activeproject.php @@ -13,14 +13,11 @@ cid=73 chdir(__DIR__); include '../lib/activeproject.ui.class.php'; -zendata('projet')->loadYaml('project', false, 2)->gen(10); $tester = new activeProjectTester(); $tester->login(); -$project = array( - array(), -); +$project = array(); -r($tester->activeProject($project['0'])) && p('message') && e('激活项目成功'); //激活项目 +r($tester->activeProject($project)) && p('message') && e('激活项目成功'); //激活项目 $tester->closeBrowser(); diff --git a/module/project/test/ui/closeproject.php b/module/project/test/ui/closeproject.php index 58314a383f..dfb14db8e6 100755 --- a/module/project/test/ui/closeproject.php +++ b/module/project/test/ui/closeproject.php @@ -13,14 +13,11 @@ cid=73 chdir(__DIR__); include '../lib/closeproject.ui.class.php'; -zendata('projet')->loadYaml('project', false, 2)->gen(10); $tester = new closeProjectTester(); $tester->login(); -$project = array( - array(), -); +$project = array(); -r($tester->closeProject($project['0'])) && p('message') && e('关闭项目成功'); //关闭项目 +r($tester->closeProject($project])) && p('message') && e('关闭项目成功'); //关闭项目 $tester->closeBrowser(); diff --git a/module/project/test/ui/createwaterfall.php b/module/project/test/ui/createwaterfall.php index c15ac89c9c..22282fab6f 100755 --- a/module/project/test/ui/createwaterfall.php +++ b/module/project/test/ui/createwaterfall.php @@ -21,7 +21,7 @@ cid=73 chdir(__DIR__); include '../lib/createwaterfall.ui.class.php'; -zendata('projet')->loadYaml('project', false, 2)->gen(10); +zendata('project')->loadYaml('project', false, 2)->gen(10); $tester = new createWaterfallTester(); $tester->login(); diff --git a/module/project/test/ui/editwaterfall.php b/module/project/test/ui/editwaterfall.php index 7b062c8061..675dac0f59 100755 --- a/module/project/test/ui/editwaterfall.php +++ b/module/project/test/ui/editwaterfall.php @@ -13,7 +13,6 @@ cid=73 chdir(__DIR__); include '../lib/editwaterfall.ui.class.php'; -zendata('projet')->loadYaml('project', false, 2)->gen(10); $tester = new editWaterfallTester(); $tester->login(); diff --git a/module/project/test/ui/page/browse.php b/module/project/test/ui/page/browse.php index b17cde38cd..7d5bfb632f 100644 --- a/module/project/test/ui/page/browse.php +++ b/module/project/test/ui/page/browse.php @@ -11,11 +11,11 @@ class browsePage extends page 'projectName' => "//*[@id='table-project-browse']/div[2]/div[1]/div/div[2]/div/a", 'scrumName' => "//*[@id='mainContent']/div[2]/div/div/div[2]/div/div/div[2]/div/a", 'moreBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div[1]/div/nav/button[1]/span", - 'closeBtn' => "//*[@title='关闭项目']", - 'closeProject' => "//span[text()='关闭项目']", + 'closeBtn' => "//*[@class='icon item-icon icon-off']", + 'closeProject' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[3]/div/div/form/div[3]/div/button", 'closed' => "//*[@id='more']/menu/menu/li[2]/a/div", - 'activeBtn' => "//*[@title='激活项目']", - 'activeProject' => "//span[text()='激活项目']", + 'activeBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div/div/nav/a[1]/i", + 'activeProject' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[3]/div/div/form/div[3]/div/button", ); $this->dom->xpath = array_merge($this->dom->xpath, $xpath); }