diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-23 20:38:12 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-23 20:38:12 +0200 |
| commit | c0699c88f8a53ca35c30bc1747ba32db56ee3e16 (patch) | |
| tree | 25c9131fa457dc275f7ce505119a0727fd75d84a /phpBB | |
| parent | 22fc5cedbe5f9cf450f8c75a7d03854cacbebf3d (diff) | |
| parent | 83326718132811d8b57ac8612ff50887ec0fa101 (diff) | |
| download | forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar.gz forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar.bz2 forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar.xz forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/11528] Change click_submit() to accept id as param
[ticket/11528] Handle case when config file cant be written by installer
[ticket/11528] Change NULL to null
[ticket/11528] Fix spaces and slashes as per guidelines
[ticket/11528] Add asserts in installation steps
[ticket/11528] Use 'use' keyword to import classes to current scope
[ticket/11528] Move parent::tearDown() to end of tearDown()
[ticket/11528] Call parent::tearDown in overrided tearDown method
[ticket/11528] Instantiate $client, $driver from functional test case
[ticket/11528] Refactor install_board() code into a new class
[ticket/11528] Add behat/mink and mink-goutte-driver as dependency
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/composer.lock | 163 |
2 files changed, 164 insertions, 1 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 435d6139e4..53d2f873f1 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -15,6 +15,8 @@ "twig/twig": "1.13.*" }, "require-dev": { + "behat/mink": "1.4.*", + "behat/mink-goutte-driver": "1.0.*", "fabpot/goutte": "1.0.*", "phpunit/dbunit": "1.3.*", "phpunit/phpunit": "4.1.*", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 2213c3789b..89973b93d4 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -3,7 +3,7 @@ "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": "be323c0a1b5baeb83934238033e079ec", + "hash": "300d29b350ca2d75b1fa169fe46470f0", "packages": [ { "name": "lusitanian/oauth", @@ -723,6 +723,167 @@ ], "packages-dev": [ { + "name": "behat/mink", + "version": "v1.4.3", + "source": { + "type": "git", + "url": "https://github.com/Behat/Mink.git", + "reference": "0817070a6e2ec9f475fad9bfb81a962c462eb934" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Mink/zipball/0817070a6e2ec9f475fad9bfb81a962c462eb934", + "reference": "0817070a6e2ec9f475fad9bfb81a962c462eb934", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/css-selector": ">=2.0,<2.4-dev" + }, + "suggest": { + "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", + "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation", + "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)", + "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Mink": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Web acceptance testing framework for PHP 5.3", + "homepage": "http://mink.behat.org/", + "keywords": [ + "browser", + "testing", + "web" + ], + "time": "2013-03-02 15:53:18" + }, + { + "name": "behat/mink-browserkit-driver", + "version": "v1.0.5", + "source": { + "type": "git", + "url": "https://github.com/Behat/MinkBrowserKitDriver.git", + "reference": "f2771b5fc4dbc233859addf37a7d150852f78418" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/MinkBrowserKitDriver/zipball/f2771b5fc4dbc233859addf37a7d150852f78418", + "reference": "f2771b5fc4dbc233859addf37a7d150852f78418", + "shasum": "" + }, + "require": { + "behat/mink": "~1.4.3", + "php": ">=5.3.1", + "symfony/browser-kit": "~2.0", + "symfony/dom-crawler": "~2.0" + }, + "require-dev": { + "silex/silex": "@dev" + }, + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Mink\\Driver": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Symfony2 BrowserKit driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "Mink", + "Symfony2", + "browser", + "testing" + ], + "time": "2013-04-13 12:17:15" + }, + { + "name": "behat/mink-goutte-driver", + "version": "v1.0.9", + "source": { + "type": "git", + "url": "https://github.com/Behat/MinkGoutteDriver.git", + "reference": "fa1b073b48761464feb0b05e6825da44b20118d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/MinkGoutteDriver/zipball/fa1b073b48761464feb0b05e6825da44b20118d8", + "reference": "fa1b073b48761464feb0b05e6825da44b20118d8", + "shasum": "" + }, + "require": { + "behat/mink-browserkit-driver": ">=1.0.5,<1.2.0", + "fabpot/goutte": "~1.0.1", + "php": ">=5.3.1" + }, + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Mink\\Driver": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Goutte driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "browser", + "goutte", + "headless", + "testing" + ], + "time": "2013-07-03 18:43:54" + }, + { "name": "fabpot/goutte", "version": "v1.0.3", "source": { |