diff options
Diffstat (limited to 'tests/FunctionalTests')
4 files changed, 8 insertions, 9 deletions
diff --git a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php index c8fcfa57..880c46fe 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php @@ -1,13 +1,13 @@ <?php -class ActiveButtonTestCase extends PradoGenericSeleniumTest +class ActiveButtonTestCase extends PradoGenericSelenium2Test { function test() { $this->open("active-controls/index.php?page=ActiveButtonTest"); $this->verifyTextPresent("TActiveButton Functional Test"); $this->assertText("label1", "Label 1"); - $this->click("button2"); + $this->clickOnElement("button2"); $this->pause(800); $this->assertText("label1", "Button 1 was clicked using callback!"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php index ff167b0e..9fe238b9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php @@ -6,19 +6,20 @@ class Ticket656TestCase extends PradoGenericSeleniumTest $base = 'ctl0_Content_'; $this->open('tickets/index.php?page=Ticket656'); $this->assertTitle("Verifying Ticket 656"); - + // First test, current date $this->click($base."btnUpdate"); $this->pause(800); $this->assertText($base."lblStatus",date("d-m-Y")); - + // Then, set another date + $year=date('Y')-2; $this->select($base."datePicker_day",20); $this->select($base."datePicker_month", 10); - $this->select($base."datePicker_year", 2008); + $this->select($base."datePicker_year", $year); $this->click($base."btnUpdate"); $this->pause(800); - $this->assertText($base."lblStatus",date("d-m-Y", mktime(0,0,0,10,20,2008))); + $this->assertText($base."lblStatus",date("d-m-Y", mktime(0,0,0,10,20,$year))); } }
\ No newline at end of file diff --git a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php index e7425a33..a80ff254 100755 --- a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php +++ b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php @@ -27,8 +27,6 @@ class DatePickerTestCase extends PradoGenericSeleniumTest $this->assertNotVisible("{$base}validator6", ""); $this->assertVisible("{$base}validator8", ""); - $this->click("{$base}submit1"); - $this->pause(250); $this->type("{$base}picker1", "13/4/$year"); $this->select("{$base}picker2_month", "label=9"); $this->select("{$base}picker2_day", "label=10"); diff --git a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php index f8b54eb0..8ee278f8 100755 --- a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php +++ b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php @@ -48,7 +48,7 @@ class RequiredFieldTestCase extends PradoGenericSeleniumTest $this->type("{$base}text1", "Hello"); $this->click("{$base}check1"); - $this->click("{$base}submit2"); + $this->clickAndWait("{$base}submit2"); $this->assertNotVisible("{$base}validator5"); $this->assertNotVisible("{$base}validator6"); |