From 3d86839c7504fd84339922e23fc78b40b134300e Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 21 Apr 2014 12:09:51 +0200 Subject: Ported 2 failing functionaltests (cherry picked from commit b438554637e082544d2288e5c3654448c2f53683) --- .../active-controls/tests/EventTriggerTestCase.php | 2 +- .../tickets/tests/Ticket722TestCase.php | 25 +++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php b/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php index dacdeaaa..7cc9a3bd 100755 --- a/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php @@ -14,7 +14,7 @@ class EventTriggerTestCase extends PradoGenericSelenium2Test $this->pause(800); $this->assertText("{$base}label1", 'button 1 clicked'); - $this->type("{$base}text1", 'test'); + $this->byId("{$base}text1")->value('test'); $this->pause(800); $this->assertText("{$base}label1", 'text 1 focused'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php index 268a3df4..dfa93089 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php @@ -7,21 +7,26 @@ class Ticket722TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket722'); $this->assertEquals($this->title(), "Verifying Ticket 722"); - $this->assertText($base.'InPlaceTextBox__label', 'Editable Text'); - $this->byId($base.'InPlaceTextBox__label')->click(); + $label = $this->byID("{$base}InPlaceTextBox__label"); + $this->assertEquals('Editable Text', $label->text()); + $label->click(); $this->pause(800); - $this->assertVisible($base.'InPlaceTextBox'); + + $textbox = $this->byID("{$base}InPlaceTextBox"); + $this->assertTrue($textbox->displayed()); + $this->type($base.'InPlaceTextBox',"Prado"); $this->pause(800); - $this->assertNotVisible($base.'InPlaceTextBox'); - $this->assertText($base.'InPlaceTextBox__label', 'Prado'); - $this->byId($base.'ctl0')->click(); - $this->pause(800); - $this->assertText($base.'InPlaceTextBox__label', 'Prado [Read Only]'); - $this->byId($base.'InPlaceTextBox__label')->click(); + $this->assertFalse($textbox->displayed()); + $this->assertEquals('Prado', $label->text()); + + $this->byId("{$base}ctl0")->click(); $this->pause(800); - $this->assertNotVisible($base.'InPlaceTextBox'); + $this->assertEquals('Prado [Read Only]', $label->text()); + $label->click(); + $this->pause(800); + $this->assertFalse($textbox->displayed()); } } \ No newline at end of file -- cgit v1.2.3