mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
[ticket/11528] Instantiate $client, $driver from functional test case
Make mink test case an abstract class, instantiate $driver, $client from its child class i.e. functional test case. PHPBB3-11528
This commit is contained in:
parent
01f350a614
commit
648cbbd9a0
2 changed files with 49 additions and 130 deletions
|
@ -14,7 +14,6 @@ use Symfony\Component\BrowserKit\CookieJar;
|
|||
|
||||
class phpbb_functional_test_case extends phpbb_mink_test_case
|
||||
{
|
||||
static protected $client;
|
||||
static protected $cookieJar;
|
||||
|
||||
protected $cache = null;
|
||||
|
@ -42,6 +41,24 @@ class phpbb_functional_test_case extends phpbb_mink_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 \Behat\Mink\Driver\Goutte\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 \Behat\Mink\Driver\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
|
||||
|
@ -74,12 +91,6 @@ class phpbb_functional_test_case extends phpbb_mink_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();
|
||||
|
@ -113,6 +124,8 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
|
|||
// Close the database connections again this test
|
||||
$this->db->sql_close();
|
||||
}
|
||||
|
||||
self::$cookieJar->clear();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -14,13 +14,23 @@ use \Behat\Mink\Session;
|
|||
|
||||
require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
|
||||
|
||||
class phpbb_mink_test_case extends phpbb_test_case
|
||||
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();
|
||||
|
@ -29,6 +39,16 @@ class phpbb_mink_test_case extends phpbb_test_case
|
|||
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)
|
||||
|
@ -37,13 +57,14 @@ class phpbb_mink_test_case extends phpbb_test_case
|
|||
$db_conn_mgr->recreate_db();
|
||||
}
|
||||
|
||||
static protected function visit($path)
|
||||
protected function tearDown()
|
||||
{
|
||||
if(!isset(self::$session))
|
||||
{
|
||||
self::markTestSkipped('Session not initialized.');
|
||||
parent::tearDown();
|
||||
self::$session->reset();
|
||||
}
|
||||
|
||||
static protected function visit($path)
|
||||
{
|
||||
self::$session->visit(self::$root_url . $path);
|
||||
return self::$session->getPage();
|
||||
}
|
||||
|
@ -59,6 +80,7 @@ class phpbb_mink_test_case extends phpbb_test_case
|
|||
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";
|
||||
|
@ -76,25 +98,6 @@ class phpbb_mink_test_case extends phpbb_test_case
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
$client = new \Behat\Mink\Driver\Goutte\Client();
|
||||
|
||||
$client_options = array(
|
||||
Guzzle\Http\Client::DISABLE_REDIRECTS => true,
|
||||
'curl.options' => array(
|
||||
CURLOPT_TIMEOUT => 120,
|
||||
),
|
||||
);
|
||||
|
||||
$client->setClient(new Guzzle\Http\Client('', $client_options));
|
||||
|
||||
// Reset the curl handle because it is 0 at this point and not a valid
|
||||
// resource
|
||||
$client->getClient()->getCurlMulti()->reset(true);
|
||||
|
||||
self::$driver = new \Behat\Mink\Driver\GoutteDriver($client);
|
||||
self::$session = new Session(self::$driver);
|
||||
|
||||
$parseURL = parse_url(self::$config['phpbb_functional_url']);
|
||||
|
||||
self::visit('install/index.php?mode=install');
|
||||
|
@ -152,103 +155,6 @@ class phpbb_mink_test_case extends phpbb_test_case
|
|||
|
||||
copy($config_file, $config_file_test);
|
||||
|
||||
/*$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);*/
|
||||
self::$session->stop();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue