From 0f3a577bed4d828472469675e90fcab032e33f44 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 2 Jun 2006 18:27:02 +0000
Subject: merge from 3.0 branch till 1133.

---
 .../FunctionalTests/validators/tests/RequiredListTestCase.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'tests/FunctionalTests/validators')

diff --git a/tests/FunctionalTests/validators/tests/RequiredListTestCase.php b/tests/FunctionalTests/validators/tests/RequiredListTestCase.php
index cb10f201..23e0f045 100644
--- a/tests/FunctionalTests/validators/tests/RequiredListTestCase.php
+++ b/tests/FunctionalTests/validators/tests/RequiredListTestCase.php
@@ -7,14 +7,13 @@ class RequiredListTestCase extends SeleniumTestCase
 	{
 		$base = "ctl0_Content_";
 		$this->open("validators/index.php?page=RequiredListValidator");
-		$this->assertLocation("index.php?page=RequiredListValidator");
 		$this->click("{$base}submit1");
 		$this->assertVisible("{$base}validator1");
 		$this->assertVisible("{$base}validator2");
 		$this->assertVisible("{$base}validator3");
 		$this->click("{$base}list1_c0");
-		$this->select("{$base}list2", "label=One");
-		$this->select("{$base}list2", "label=Two");
+		$this->addSelection("{$base}list2", "label=One");
+		$this->addSelection("{$base}list2", "label=Two");
 		$this->click("{$base}list3_c3");
 		$this->clickAndWait("{$base}submit1");
 		$this->assertNotVisible("{$base}validator1");
@@ -23,14 +22,14 @@ class RequiredListTestCase extends SeleniumTestCase
 		$this->click("{$base}list1_c1");
 		$this->click("{$base}list1_c2");
 		$this->click("{$base}list1_c3");
-		$this->select("{$base}list2", "label=Two");
+		$this->addSelection("{$base}list2", "label=Two");
 		$this->click("{$base}list1_c3");
-		$this->click("{$base}submit1");
+		$this->clickAndWait("{$base}submit1");
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
 		$this->assertNotVisible("{$base}validator3");
 		$this->click("{$base}list3_c3");
-		$this->click("{$base}submit1");
+		$this->clickAndWait("{$base}submit1");
 		$this->pause(200);
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
-- 
cgit v1.2.3