From 3db08b4d991c02870d04f7198d65fd926805709c Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 25 Feb 2014 22:43:00 +0100
Subject: Ensure all tests have a proper doctype and html structure, to avoid
 browser's quirks mode (cherry picked from commit
 a0d6864093cf13a96dafa8a47b5c43891b2b864f)

Conflicts:
	tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
	tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
---
 tests/test_tools/PradoGenericSeleniumTest.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'tests/test_tools/PradoGenericSeleniumTest.php')

diff --git a/tests/test_tools/PradoGenericSeleniumTest.php b/tests/test_tools/PradoGenericSeleniumTest.php
index 66502210..c3d3f4f0 100644
--- a/tests/test_tools/PradoGenericSeleniumTest.php
+++ b/tests/test_tools/PradoGenericSeleniumTest.php
@@ -4,7 +4,7 @@ require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
 class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
 {
 	public static $browsers = array(
-		/*
+/*
 		array(
 			'name'    => 'Firefox on OSX',
 			'browser' => '*firefox',
@@ -12,33 +12,35 @@ class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
 			'port'    => 4444,
 			'timeout' => 30000,
 		),
+*/
 		array(
 			'name'    => 'Chrome on OSX',
-			'browser' => '*chrome',
+			'browser' => '*googlechrome',
 			'host'    => '127.0.0.1',
 			'port'    => 4444,
 			'timeout' => 30000,
 		),
+/*
 		array(
-			'name'    => 'Internet Explorer 11 on Windows8.1',
-			'browser' => '*iexplore',
-			'host'    => '192.168.253.39',
-			'port'    => 4444,
+			'name'    => 'Firefox on WindowsXP',
+			'browser' => '*firefox',
+			'host'    => '127.0.0.1',
+			'port'    => 4445,
 		),
-		*/
 		array(
 			'name'    => 'Internet Explorer 8 on WindowsXP',
 			'browser' => '*iehta',
 			'host'    => '127.0.0.1',
-			'port'    => 4444,
-		)
+			'port'    => 4445,
+		),
+*/
 	);
 
-	static $baseurl='http://10.0.2.2/prado-master/tests/FunctionalTests/';
+	static $baseurl='http://192.168.44.82/prado-master/tests/FunctionalTests/';
 
 	protected function setUp()
 	{
-//		$this->shareSession(true);
+		$this->shareSession(true);
 		$this->setBrowserUrl(static::$baseurl);
 	}
 
-- 
cgit v1.2.3