diff options
| -rw-r--r-- | phpBB/composer.json | 1 | ||||
| -rw-r--r-- | phpBB/composer.lock | 48 | ||||
| -rw-r--r-- | tests/composer.json | 5 | ||||
| -rw-r--r-- | tests/composer.lock | 63 | ||||
| -rwxr-xr-x | travis/install-phpbb-test-dependencies.sh | 16 | ||||
| -rwxr-xr-x | travis/setup-phpbb.sh | 1 |
6 files changed, 87 insertions, 47 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index d6245cf980..6b3a2c9918 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -38,7 +38,6 @@ }, "require-dev": { "fabpot/goutte": "1.0.*", - "facebook/webdriver": "~1.1", "phing/phing": "2.4.*", "phpunit/dbunit": "1.3.*", "phpunit/phpunit": "4.1.*", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index e195587956..5d6b1ba7a7 100644 --- a/phpBB/composer.lock +++ b/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": "b947a331fff3c804e6c392afc34d00fa", - "content-hash": "29849b951e00868df661e632857969ac", + "hash": "33fa9de480a8a9c8f7e3f2926cd4c034", + "content-hash": "2d9c1857e65554ceb4cfa435495df188", "packages": [ { "name": "lusitanian/oauth", @@ -864,50 +864,6 @@ "time": "2014-10-09 15:52:51" }, { - "name": "facebook/webdriver", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/facebook/php-webdriver.git", - "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986", - "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "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": "2016-06-04 00:02:34" - }, - { "name": "guzzle/common", "version": "v3.9.2", "target-dir": "Guzzle/Common", diff --git a/tests/composer.json b/tests/composer.json new file mode 100644 index 0000000000..057e0115a5 --- /dev/null +++ b/tests/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "facebook/webdriver": "~1.1" + } +} diff --git a/tests/composer.lock b/tests/composer.lock new file mode 100644 index 0000000000..f172de4669 --- /dev/null +++ b/tests/composer.lock @@ -0,0 +1,63 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "25ad22c35c19f2b0a2331640fb6b5577", + "content-hash": "617c33144bd2877c3c9a78f167a871b6", + "packages": [], + "packages-dev": [ + { + "name": "facebook/webdriver", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/facebook/php-webdriver.git", + "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986", + "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "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": "2016-06-04 00:02:34" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/travis/install-phpbb-test-dependencies.sh b/travis/install-phpbb-test-dependencies.sh new file mode 100755 index 0000000000..25743ff2b1 --- /dev/null +++ b/travis/install-phpbb-test-dependencies.sh @@ -0,0 +1,16 @@ +#!/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 .. diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index 8bdf2176bb..4daa754481 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -33,6 +33,7 @@ fi if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ] then travis/setup-webserver.sh + travis/install-phpbb-test-dependencies.sh fi cd phpBB |