diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php index 3578e98827ff3b9d14f106cb301e2c3ec7883e52..47b38c9760c47c52f8af7ee3c5f8096e1c0fb08b 100644 --- a/tests/application/modules/admin/controllers/UsersControllerTest.php +++ b/tests/application/modules/admin/controllers/UsersControllerTest.php @@ -610,7 +610,7 @@ class UsersControllerAddViewTest extends AbstractControllerTestCase { /** @test */ public function idSiteSelectorShouldNotBeDisabled() { - $this->assertNotXPath('//form//select[@id="id_site"][@disabled]'); + $this->assertXPath('//form//select[@id="id_site"][not(@disabled)]'); } } @@ -825,31 +825,31 @@ class Admin_UsersControllerFormEditAdminTest extends Admin_UsersControllerEditAd /** @test */ public function portailShouldBePresent() { - $this->assertXPath('//fieldset//table//tr//td//select[@name="id_site"]//option[@value="0"]'); + $this->assertXPath('//form//select[@name="id_site"]//option[@value="0"]'); } /** @test */ public function libACSHouldBeSelected() { - $this->assertXPathContentContains('//fieldset//table//tr//td//select[@name="id_site"]//option[@value="1"][@selected]', 'AC'); + $this->assertXPathContentContains('//form//select[@name="id_site"]//option[@value="1"][@selected]', 'AC'); } /** @test */ public function idSiteSelectorShouldNotBeDisabled() { - $this->assertNotXPath('//fieldset//table//tr//td//select[@name="id_site"][@disabled]'); + $this->assertXPath('//form//select[@name="id_site"][not(@disabled)]'); } /** @test */ public function roleLevelSuperShouldNotBePresent() { - $this->assertNotXPath('//fieldset//table//tr//td//select[@name="role_level"]//option[@value="7"]'); + $this->assertNotXPath('//form//select[@name="role_level"]//option[@value="7"]'); } /** @test */ public function withModoPortailRedmineLibrarySelectorShouldBePresent() { - $this->assertXPath('//fieldset//table//tr//td//select[@name="redmine_library"]', $this->_response->getBody()); + $this->assertXPath('//form//select[@name="redmine_library"]', $this->_response->getBody()); } @@ -913,7 +913,7 @@ class UsersControllerEditSuperAdminTest extends Admin_AbstractControllerTestCase /** @test */ public function roleLevelSuperShouldBePresent() { - $this->assertXPath('//fieldset//table//tr//td//select[@name="role_level"][@disabled="disabled"]//option[@value="7"]'); + $this->assertXPath('//form//select[@name="role_level"][@disabled="disabled"]//option[@value="7"]'); } } @@ -937,6 +937,6 @@ class UsersControllerEditUserAsModoPortalTest extends AbstractControllerTestCase /** @test */ public function roleLevelShouldBeDisabled() { - $this->assertXPath('//fieldset//table//tr//td//select[@name="role_level"][@disabled="disabled"]'); + $this->assertXPath('//form//select[@name="role_level"][@disabled="disabled"]'); } } \ No newline at end of file