mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 19:07:27 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2587 from dhruvgoel92/ticket/11528

Browse Source 
[ticket/11528] Refactor install_board( ) into a new mink class

* dhruvgoel92/ticket/11528:
  [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
This commit is contained in:
Andreas Fischer 2014-06-23 20:38:11 +02:00
commit 8332671813
9 changed files with 380 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/composer.json
View File

@ -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.*",

163
phpBB/composer.lock generated
View File

@ -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",
@ -722,6 +722,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",

1
tests/bootstrap.php
View File

@ -31,4 +31,5 @@ require_once 'test_framework/phpbb_test_case_helpers.php';
require_once 'test_framework/phpbb_test_case.php';
require_once 'test_framework/phpbb_database_test_case.php';
require_once 'test_framework/phpbb_database_test_connection_manager.php';
require_once 'test_framework/phpbb_mink_test_case.php';
require_once 'test_framework/phpbb_functional_test_case.php';

2
tests/functional/fileupload_form_test.php
View File

@ -42,6 +42,8 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
unlink($fileinfo->getPathname());
}
parent::tearDown();
}
private function upload_file($filename, $mimetype)

2
tests/functional/fileupload_remote_test.php
View File

@ -43,6 +43,8 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
global $config, $user;
$user = null;
$config = array();
parent::tearDown();
}
public function test_invalid_extension()

2
tests/functional/forgot_password_test.php
View File

@ -57,5 +57,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
'config[allow_password_reset]' => 1,
));
$crawler = self::submit($form);
parent::tearDown();
}
}

2
tests/functional/plupload_test.php
View File

@ -57,6 +57,8 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
unlink($fileinfo->getPathname());
}
parent::tearDown();
}
public function get_urls()

182
tests/test_framework/phpbb_functional_test_case.php
View File

@ -11,14 +11,12 @@
*
*/
use Symfony\Component\BrowserKit\CookieJar;
use Behat\Mink\Driver\Goutte\Client;
use Behat\Mink\Driver\GoutteDriver;
require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
class phpbb_functional_test_case extends phpbb_test_case
class phpbb_functional_test_case extends phpbb_mink_test_case
{
static protected $client;
static protected $cookieJar;
static protected $root_url;
protected $cache = null;
protected $db = null;
@ -36,7 +34,6 @@ class phpbb_functional_test_case extends phpbb_test_case
*/
protected $lang = array();
static protected $config = array();
static protected $already_installed = false;
static public function setUpBeforeClass()
@ -46,6 +43,24 @@ class phpbb_functional_test_case extends phpbb_test_case
self::$config = phpbb_test_case_helpers::get_test_config();
self::$root_url = self::$config['phpbb_functional_url'];
self::$cookieJar = new CookieJar;
self::$client = new Client(array(), null, self::$cookieJar);
$client_options = array(
Guzzle\Http\Client::DISABLE_REDIRECTS => true,
'curl.options' => array(
CURLOPT_TIMEOUT => 120,
),
);
self::$client->setClient(new Guzzle\Http\Client('', $client_options));
// Reset the curl handle because it is 0 at this point and not a valid
// resource
self::$client->getClient()->getCurlMulti()->reset(true);
self::$driver = new GoutteDriver(self::$client);
// Important: this is used both for installation and by
// test cases for querying the tables.
// Therefore table prefix must be set before a board is
@ -78,12 +93,6 @@ class phpbb_functional_test_case extends phpbb_test_case
$this->bootstrap();
self::$cookieJar = new CookieJar;
self::$client = new Goutte\Client(array(), null, self::$cookieJar);
// Reset the curl handle because it is 0 at this point and not a valid
// resource
self::$client->getClient()->getCurlMulti()->reset(true);
// Clear the language array so that things
// that were added in other tests are gone
$this->lang = array();
@ -110,13 +119,14 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function tearDown()
{
parent::tearDown();
if ($this->db instanceof \phpbb\db\driver\driver_interface)
{
// Close the database connections again this test
$this->db->sql_close();
}
self::$cookieJar->clear();
parent::tearDown();
}
/**
@ -256,144 +266,6 @@ class phpbb_functional_test_case extends phpbb_test_case
return $extension_manager;
}
static protected function install_board()
{
global $phpbb_root_path, $phpEx;
self::recreate_database(self::$config);
$config_file = $phpbb_root_path . "config.$phpEx";
$config_file_dev = $phpbb_root_path . "config_dev.$phpEx";
$config_file_test = $phpbb_root_path . "config_test.$phpEx";
if (file_exists($config_file))
{
if (!file_exists($config_file_dev))
{
rename($config_file, $config_file_dev);
}
else
{
unlink($config_file);
}
}
self::$cookieJar = new CookieJar;
self::$client = new Goutte\Client(array(), null, self::$cookieJar);
// Set client manually so we can increase the cURL timeout
self::$client->setClient(new Guzzle\Http\Client('', array(
Guzzle\Http\Client::DISABLE_REDIRECTS => true,
'curl.options' => array(
CURLOPT_TIMEOUT => 120,
),
)));
// Reset the curl handle because it is 0 at this point and not a valid
// resource
self::$client->getClient()->getCurlMulti()->reset(true);
$parseURL = parse_url(self::$config['phpbb_functional_url']);
$crawler = self::request('GET', 'install/index.php?mode=install');
self::assertContains('Welcome to Installation', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form();
// install/index.php?mode=install&sub=requirements
$crawler = self::submit($form);
self::assertContains('Installation compatibility', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form();
// install/index.php?mode=install&sub=database
$crawler = self::submit($form);
self::assertContains('Database configuration', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form(array(
// Installer uses 3.0-style dbms name
'dbms' => str_replace('phpbb\db\driver\\', '', self::$config['dbms']),
'dbhost' => self::$config['dbhost'],
'dbport' => self::$config['dbport'],
'dbname' => self::$config['dbname'],
'dbuser' => self::$config['dbuser'],
'dbpasswd' => self::$config['dbpasswd'],
'table_prefix' => self::$config['table_prefix'],
));
// install/index.php?mode=install&sub=database
$crawler = self::submit($form);
self::assertContains('Successful connection', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form();
// install/index.php?mode=install&sub=administrator
$crawler = self::submit($form);
self::assertContains('Administrator configuration', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form(array(
'default_lang' => 'en',
'admin_name' => 'admin',
'admin_pass1' => 'adminadmin',
'admin_pass2' => 'adminadmin',
'board_email' => 'nobody@example.com',
));
// install/index.php?mode=install&sub=administrator
$crawler = self::submit($form);
self::assertContains('Tests passed', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form();
// We have to skip install/index.php?mode=install&sub=config_file
// because that step will create a config.php file if phpBB has the
// permission to do so. We have to create the config file on our own
// in order to get the DEBUG constants defined.
$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, false, true);
$config_created = file_put_contents($config_file, $config_php_data) !== false;
if (!$config_created)
{
self::markTestSkipped("Could not write $config_file file.");
}
// We also have to create a install lock that is normally created by
// the installer. The file will be removed by the final step of the
// installer.
$install_lock_file = $phpbb_root_path . 'cache/install_lock';
$lock_created = file_put_contents($install_lock_file, '') !== false;
if (!$lock_created)
{
self::markTestSkipped("Could not create $lock_created file.");
}
@chmod($install_lock_file, 0666);
// install/index.php?mode=install&sub=advanced
$form_data = $form->getValues();
unset($form_data['submit']);
$crawler = self::request('POST', 'install/index.php?mode=install&sub=advanced', $form_data);
self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form(array(
'email_enable' => true,
'smtp_delivery' => true,
'smtp_host' => 'nxdomain.phpbb.com',
'smtp_auth' => 'PLAIN',
'smtp_user' => 'nxuser',
'smtp_pass' => 'nxpass',
'cookie_secure' => false,
'force_server_vars' => false,
'server_protocol' => $parseURL['scheme'] . '://',
'server_name' => 'localhost',
'server_port' => isset($parseURL['port']) ? (int) $parseURL['port'] : 80,
'script_path' => $parseURL['path'],
));
// install/index.php?mode=install&sub=create_table
$crawler = self::submit($form);
self::assertContains('The database tables used by phpBB', $crawler->filter('#main')->text());
self::assertContains('have been created and populated with some initial data.', $crawler->filter('#main')->text());
$form = $crawler->selectButton('submit')->form();
// install/index.php?mode=install&sub=final
$crawler = self::submit($form);
self::assertContains('You have successfully installed', $crawler->text());
copy($config_file, $config_file_test);
}
public function install_ext($extension)
{
$this->login();
@ -412,12 +284,6 @@ class phpbb_functional_test_case extends phpbb_test_case
$this->logout();
}
static private function recreate_database($config)
{
$db_conn_mgr = new phpbb_database_test_connection_manager($config);
$db_conn_mgr->recreate_db();
}
/**
* Creates a new style
*

183
tests/test_framework/phpbb_mink_test_case.php Normal file
View File

@ -0,0 +1,183 @@
<?php
/**
*
* 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.
*
*/
use \Behat\Mink\Session;
require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
abstract class phpbb_mink_test_case extends phpbb_test_case
{
static protected $driver;
static protected $client;
static protected $session;
static protected $config = array();
static protected $root_url;
public function __construct($name = null, array $data = array(), $dataName = '')
{
parent::__construct($name, $data, $dataName);
$this->backupStaticAttributesBlacklist += array(
'phpbb_mink_test_case' => array('config', 'already_installed'),
);
}
static public function setUpBeforeClass()
{
parent::setUpBeforeClass();
}
public function setUp()
{
parent::setUp();
if (!self::$driver)
{
self::markTestSkipped('Mink driver not initialized.');
}
if (!self::$session)
{
self::$session = new Session(self::$driver);
}
}
static protected function recreate_database($config)
{
$db_conn_mgr = new phpbb_database_test_connection_manager($config);
$db_conn_mgr->recreate_db();
}
protected function tearDown()
{
self::$session->reset();
parent::tearDown();
}
static protected function visit($path)
{
self::$session->visit(self::$root_url . $path);
return self::$session->getPage();
}
static protected function click_submit($submit_button_id = 'submit')
{
self::$session->getPage()->findById($submit_button_id)->click();
return self::$session->getPage();
}
static protected function install_board()
{
global $phpbb_root_path, $phpEx;
self::recreate_database(self::$config);
self::$session = new Session(self::$driver);
$config_file = $phpbb_root_path . "config.$phpEx";
$config_file_dev = $phpbb_root_path . "config_dev.$phpEx";
$config_file_test = $phpbb_root_path . "config_test.$phpEx";
if (file_exists($config_file))
{
if (!file_exists($config_file_dev))
{
rename($config_file, $config_file_dev);
}
else
{
unlink($config_file);
}
}
$parseURL = parse_url(self::$config['phpbb_functional_url']);
$page = self::visit('install/index.php?mode=install');
self::assertContains('Welcome to Installation', $page->findById('main')->getText());
// install/index.php?mode=install&sub=requirements
$page = self::click_submit();
self::assertContains('Installation compatibility', $page->findById('main')->getText());
// install/index.php?mode=install&sub=database
$page = self::click_submit();
self::assertContains('Database configuration', $page->findById('main')->getText());
$page->findById('dbms')->setValue(str_replace('phpbb\db\driver\\', '', self::$config['dbms']));
$page->findById('dbhost')->setValue(self::$config['dbhost']);
$page->findById('dbport')->setValue(self::$config['dbport']);
$page->findById('dbname')->setValue(self::$config['dbname']);
$page->findById('dbuser')->setValue(self::$config['dbuser']);
$page->findById('dbpasswd')->setValue(self::$config['dbpasswd']);
$page->findById('table_prefix')->setValue(self::$config['table_prefix']);
// install/index.php?mode=install&sub=database
$page = self::click_submit();
self::assertContains('Successful connection', $page->findById('main')->getText());
// install/index.php?mode=install&sub=administrator
$page = self::click_submit();
self::assertContains('Administrator configuration', $page->findById('main')->getText());
$page->findById('admin_name')->setValue('admin');
$page->findById('admin_pass1')->setValue('adminadmin');
$page->findById('admin_pass2')->setValue('adminadmin');
$page->findById('board_email')->setValue('nobody@example.com');
// install/index.php?mode=install&sub=administrator
$page = self::click_submit();
self::assertContains('Tests passed', $page->findById('main')->getText());
// install/index.php?mode=install&sub=config_file
$page = self::click_submit();
// Installer has created a config.php file, we will overwrite it with a
// config file of our own in order to get the DEBUG constants defined
$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, false, true);
$config_created = file_put_contents($config_file, $config_php_data) !== false;
if (!$config_created)
{
self::markTestSkipped("Could not write $config_file file.");
}
if (strpos($page->findById('main')->getText(), 'The configuration file has been written') === false)
{
$page = self::click_submit('dldone');
}
self::assertContains('The configuration file has been written', $page->findById('main')->getText());
// install/index.php?mode=install&sub=advanced
$page = self::click_submit();
self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $page->findById('main')->getText());
$page->findById('smtp_delivery')->setValue('1');
$page->findById('smtp_host')->setValue('nxdomain.phpbb.com');
$page->findById('smtp_user')->setValue('nxuser');
$page->findById('smtp_pass')->setValue('nxpass');
$page->findById('server_protocol')->setValue($parseURL['scheme'] . '://');
$page->findById('server_name')->setValue('localhost');
$page->findById('server_port')->setValue(isset($parseURL['port']) ? $parseURL['port'] : 80);
$page->findById('script_path')->setValue($parseURL['path']);
// install/index.php?mode=install&sub=create_table
$page = self::click_submit();
self::assertContains('The database tables used by phpBB', $page->findById('main')->getText());
self::assertContains('have been created and populated with some initial data.', $page->findById('main')->getText());
// install/index.php?mode=install&sub=final
$page = self::click_submit();
self::assertContains('You have successfully installed', $page->getText());
copy($config_file, $config_file_test);
self::$session->stop();
}
}