Switch back to chrome for CI testing

Signed-off-by: Michal Čihař <michal@cihar.com>

1 files changed, 37 insertions, 33 deletions

diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 6f66b4337d..a6cbd6bd14 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -69,6 +69,20 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
 
             $result = array();
             $result[] = array(
+                'browserName' => 'chrome',
+                'host' => 'hub.browserstack.com',
+                'port' => 80,
+                'timeout' => 30000,
+                'sessionStrategy' => 'shared',
+                'desiredCapabilities' => $capabilities,
+            );
+
+            /* Only one browser for continuous integration for speed */
+            if (empty($GLOBALS['TESTSUITE_FULL'])) {
+                return $result;
+            }
+
+            $result[] = array(
                 'browserName' => 'Safari',
                 'host' => 'hub.browserstack.com',
                 'port' => 80,
@@ -82,40 +96,30 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
                     )
                 )
             );
-            if (!empty($GLOBALS['TESTSUITE_FULL'])) {
-                $result[] = array(
-                    'browserName' => 'chrome',
-                    'host' => 'hub.browserstack.com',
-                    'port' => 80,
-                    'timeout' => 30000,
-                    'sessionStrategy' => 'shared',
-                    'desiredCapabilities' => $capabilities,
-                );
-                $result[] = array(
-                    'browserName' => 'firefox',
-                    'host' => 'hub.browserstack.com',
-                    'port' => 80,
-                    'timeout' => 30000,
-                    'sessionStrategy' => 'shared',
-                    'desiredCapabilities' => $capabilities,
-                );
-                /* TODO: testing is MSIE is currently broken, so disabled
-                $result[] = array(
-                    'browserName' => 'internet explorer',
-                    'host' => 'hub.browserstack.com',
-                    'port' => 80,
-                    'timeout' => 30000,
-                    'sessionStrategy' => 'shared',
-                    'desiredCapabilities' => array_merge(
-                        $capabilities,
-                        array(
-                            'os' => 'windows',
-                            'os_version' => '7',
-                        )
+            $result[] = array(
+                'browserName' => 'firefox',
+                'host' => 'hub.browserstack.com',
+                'port' => 80,
+                'timeout' => 30000,
+                'sessionStrategy' => 'shared',
+                'desiredCapabilities' => $capabilities,
+            );
+            /* TODO: testing is MSIE is currently broken, so disabled
+            $result[] = array(
+                'browserName' => 'internet explorer',
+                'host' => 'hub.browserstack.com',
+                'port' => 80,
+                'timeout' => 30000,
+                'sessionStrategy' => 'shared',
+                'desiredCapabilities' => array_merge(
+                    $capabilities,
+                    array(
+                        'os' => 'windows',
+                        'os_version' => '7',
                     )
-                );
-                */
-            }
+                )
+            );
+            */
             return $result;
         } elseif (! empty($GLOBALS['TESTSUITE_SELENIUM_HOST'])) {
             self::$_selenium_enabled = true;