summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid <ottodavid@gmx.net>2014-08-22 11:39:55 +0200
committerDavid <ottodavid@gmx.net>2014-08-22 12:42:00 +0200
commit716b5d9bf7cc77772a7542ee7cbc6062289578cf (patch)
tree7effa8c9cd7d56443eab580952febc7642375325
parent31860bfece30381dd29c9d33ef0d13c4cb9f5825 (diff)
Fix failing test cases
because of timing issues (cherry picked from commit 6c6c4821c5a28df7d80cc414a7cf64025859c194)
-rwxr-xr-xtests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php12
-rwxr-xr-xtests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php1
-rwxr-xr-xtests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php1
-rwxr-xr-xtests/FunctionalTests/quickstart/Controls/DataList2TestCase.php1
4 files changed, 9 insertions, 6 deletions
diff --git a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
index 058aae01..3fbf1e5e 100755
--- a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
@@ -12,30 +12,30 @@ class AutoCompleteTestCase extends PradoGenericSelenium2Test
$this->byId("{$base}textbox3")->click();
$this->keys('a');
- $this->pause(500);
+ $this->pause(800);
$this->assertContains('Andorra', $this->source());
$this->assertText("{$base}label1", "suggestion for a");
$this->keys('u');
- $this->pause(500);
+ $this->pause(800);
$this->assertContains('Australia', $this->source());
$this->assertText("{$base}label1", "suggestion for au");
$this->byCssSelector("#{$base}textbox3_result ul li")->click();
- $this->pause(500);
+ $this->pause(800);
$this->assertText("{$base}label1", "Label 1: Austria");
$this->byId("{$base}textbox2")->click();
$this->keys('cu');
- $this->pause(500);
+ $this->pause(800);
$this->byCssSelector("#{$base}textbox2_result ul li")->click();
- $this->pause(500);
+ $this->pause(800);
$this->assertText("{$base}label1", "Label 1: Cuba");
$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::END);
$this->keys(',me');
- $this->pause(500);
+ $this->pause(800);
$this->byCssSelector("#{$base}textbox2_result ul li")->click();
$this->pause(500);
$this->assertText("{$base}label1", "Label 1: Cuba,Mexico");
diff --git a/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php b/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php
index 25dabe24..d5d112d8 100755
--- a/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php
@@ -28,6 +28,7 @@ class CallbackAdapterTestCase extends PradoGenericSelenium2Test
$this->byId("{$base}button2")->click();
$this->assertEquals('ok', $this->alertText());
$this->acceptAlert();
+ $this->pause(500);
$this->assertEquals('baz!', $this->alertText());
$this->acceptAlert();
}
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
index f0e88996..e87b9072 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
@@ -42,6 +42,7 @@ class QuickstartDataGrid3TestCase extends PradoGenericSelenium2Test
$this->assertEquals("Are you sure?", $this->alertText());
$this->acceptAlert();
+ $this->pause(500);
$this->assertNotContains("Design Patterns Explained : A New Perspective on Object-Oriented Design", $this->source());
$this->assertContains("Extreme Programming Explained : Embrace Change", $this->source());
diff --git a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
index 911fdc93..c21d71f3 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
@@ -48,6 +48,7 @@ class QuickstartDataList2TestCase extends PradoGenericSelenium2Test
$this->assertEquals("Are you sure?", $this->alertText());
$this->acceptAlert();
+ $this->pause(300); // wait for reload
$this->byId("ctl0_body_DataList_ctl5_ctl2")->click();
$this->assertEquals("Are you sure?", $this->alertText());