update ajax callback to be quequed

2 files changed, 25 insertions, 1 deletions

diff --git a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
index 96c0fb4b..59b266d8 100644
--- a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
@@ -4,6 +4,8 @@ class AutoCompleteTestCase extends SeleniumTestCase
 {
 	function test()
 	{
+		$this->skipBrowsers(self::INTERNET_EXPLORER);
+
 		$this->open("active-controls/index.php?page=AutoCompleteTest");
 		$this->verifyTextPresent("TAutoComplete Test");
 
@@ -16,7 +18,7 @@ class AutoCompleteTestCase extends SeleniumTestCase
 		$this->pause(1000);
 		$this->verifyTextPresent('Australia');
 		$this->click("heading"); //click somewhere else.
-		$this->waitForText("label1", "suggestion for au");
+		$this->pause(800);
 		$this->assertText("label1", "suggestion for au");
 		$this->click("css=#textbox3_result ul li");
 		$this->pause(800);
diff --git a/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php
new file mode 100644
index 00000000..3653dae1
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php
@@ -0,0 +1,22 @@
+<?php

+

+class DelayedCallbackTestCase extends SeleniumTestCase

+{

+	function test()

+	{

+		$this->open("active-controls/index.php?page=DelayedCallback");

+		$this->verifyTextPresent("Delayed Callback Test");

+

+		$this->assertText("status", "");

+		$this->click("button1");

+		$this->click("button2");

+

+		$this->pause("5000");

+		$this->assertText("status", "Callback 1 returned after 4s");

+		$this->pause("3000");

+		$this->assertText("status", "Callback 2 delayed 2s");

+

+	}

+}

+

+?>
\ No newline at end of file