From 48577f63f414dc3078abc4bdc93bde932fe666a6 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 6 Jan 2014 22:34:49 +0100
Subject: Fixed some function tests; start working on porting them to Selenium2
 interface (cherry picked from commit
 5d9f6fc77131d75e6c73a7e57df8d967b6b09215)

Conflicts:
	tests/FunctionalTests/validators/tests/DatePickerTestCase.php
---
 tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/FunctionalTests/active-controls')

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!");
 	}
-- 
cgit v1.2.3