Merge pull request #4180 from marc1706/ticket/14478

[ticket/14478] Move facebook/webdriver dependency to main composer file

* marc1706/ticket/14478:
  [ticket/14478] Remove no longer required shell script
  [ticket/14478] Move facebook/webdriver dependency to main composer file

phpBB/composer.json

@@ -49,6 +49,7 @@
 	},
 	"require-dev": {
 		"fabpot/goutte": "~2.0",
+		"facebook/webdriver": "~1.1",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
 		"phpunit/phpunit": "4.1.*",

phpBB/composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d4e2fb7ee961c4734df4e385db2e6995",
+    "hash": "2de20b0ffe0ca05fb62a7c685a25ca79",
-    "content-hash": "b15dfee84d1e9f3e2f5a3cc290b0be58",
+    "content-hash": "6e427257e82c0d33fc94040d9685f516",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -1606,6 +1606,49 @@
             ],
             "time": "2015-05-05 21:14:57"
         },
+        {
+            "name": "facebook/webdriver",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "1c98108ba3eb435b681655764de11502a0653705"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705",
+                "reference": "1c98108ba3eb435b681655764de11502a0653705",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.19"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.6.*"
+            },
+            "suggest": {
+                "phpdocumentor/phpdocumentor": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A PHP client for WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2015-12-31 15:58:49"
+        },
         {
             "name": "michelf/php-markdown",
             "version": "1.6.0",

tests/composer.json

@@ -1,5 +0,0 @@
-{
-	"require-dev": {
-		"facebook/webdriver": "dev-master"
-	}
-}

tests/composer.lock

@@ -1,66 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
-    ],
-    "hash": "cf1d8a4841e5e669b148e0df6645a788",
-    "packages": [
-
-    ],
-    "packages-dev": [
-        {
-            "name": "facebook/webdriver",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "b6e002e5bf811a8edba393ce6872322c1b7cf796"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/b6e002e5bf811a8edba393ce6872322c1b7cf796",
-                "reference": "b6e002e5bf811a8edba393ce6872322c1b7cf796",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.19"
-            },
-            "require-dev": {
-                "phpdocumentor/phpdocumentor": "2.*",
-                "phpunit/phpunit": "3.7.*"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "lib/"
-                ]
-            },
-            "notification-url": "http://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "description": "A php client for WebDriver",
-            "homepage": "https://github.com/facebook/php-webdriver",
-            "keywords": [
-                "facebook",
-                "php",
-                "selenium",
-                "webdriver"
-            ],
-            "time": "2014-08-05 02:55:46"
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "facebook/webdriver": 20
-    },
-    "platform": [
-
-    ],
-    "platform-dev": [
-
-    ]
-}

tests/test_framework/phpbb_ui_test_case.php

@@ -11,6 +11,11 @@
 *
 */
 
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\Exception\WebDriverCurlException;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+
 require_once __DIR__ . '/mock/phpbb_mock_null_installer_task.php';
 
 class phpbb_ui_test_case extends phpbb_test_case
@@ -19,7 +24,7 @@ class phpbb_ui_test_case extends phpbb_test_case
 	static protected $port = 8910;
 
 	/**
-	* @var \RemoteWebDriver
+	* @var RemoteWebDriver
 	*/
 	static protected $webDriver;
 
@@ -35,7 +40,7 @@ class phpbb_ui_test_case extends phpbb_test_case
 		{
 			self::markTestSkipped('UI test case requires at least PHP 5.3.19.');
 		}
-		else if (!class_exists('\RemoteWebDriver'))
+		else if (!class_exists('\Facebook\WebDriver\Remote\RemoteWebDriver'))
 		{
 			self::markTestSkipped(
 				'Could not find RemoteWebDriver class. ' .
@@ -60,7 +65,7 @@ class phpbb_ui_test_case extends phpbb_test_case
 		if (!self::$webDriver)
 		{
 			try {
-				$capabilities = array(\WebDriverCapabilityType::BROWSER_NAME => 'firefox');
+				$capabilities = DesiredCapabilities::firefox();
 				self::$webDriver = RemoteWebDriver::create(self::$host . ':' . self::$port, $capabilities);
 			} catch (WebDriverCurlException $e) {
 				self::markTestSkipped('PhantomJS webserver is not running.');

travis/install-phpbb-test-dependencies.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This file is part of the phpBB Forum Software package.
-#
-# @copyright (c) phpBB Limited <https://www.phpbb.com>
-# @license GNU General Public License, version 2 (GPL-2.0)
-#
-# For full copyright and license information, please see
-# the docs/CREDITS.txt file.
-#
-set -e
-set -x
-
-cd tests
-php ../composer.phar install --dev --no-interaction --prefer-source
-cd ..

travis/setup-phpbb.sh

@@ -34,7 +34,6 @@ fi
 if [ "$NOTESTS" != '1' ]
 then
 	travis/setup-webserver.sh
-	travis/install-phpbb-test-dependencies.sh
 fi
 
 cd phpBB