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

Merge remote-tracking branch 'cyberalien/ticket/11868' into develop

Browse Source 
* cyberalien/ticket/11868:
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
This commit is contained in:
Andreas Fischer
2013-09-26 14:24:50 +02:00
parent e8303bc319 ccf00c7265
commit 36bf4438e4
4 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/ucp/ucp_login_link.php
View File

@@ -72,8 +72,8 @@ class ucp_login_link
{
if ($request->is_set_post('login'))
{
$login_username = $request->variable('login_username', '', false, phpbb_request_interface::POST);
$login_password = $request->untrimmed_variable('login_password', '', true, phpbb_request_interface::POST);
$login_username = $request->variable('login_username', '', false, \phpbb\request\request_interface::POST);
$login_password = $request->untrimmed_variable('login_password', '', true, \phpbb\request\request_interface::POST);
$login_result = $auth_provider->login($login_username, $login_password);
@@ -153,7 +153,7 @@ class ucp_login_link
{
global $request;
$var_names = $request->variable_names(phpbb_request_interface::GET);
$var_names = $request->variable_names(\phpbb\request\request_interface::GET);
$login_link_data = array();
$string_start_length = strlen('login_link_');
@@ -162,7 +162,7 @@ class ucp_login_link
if (strpos($var_name, 'login_link_') === 0)
{
$key_name = substr($var_name, $string_start_length);
$login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::GET);
$login_link_data[$key_name] = $request->variable($var_name, '', false, \phpbb\request\request_interface::GET);
}
}

4
phpBB/includes/ucp/ucp_register.php
View File

@@ -516,7 +516,7 @@ class ucp_register
{
global $request;
$var_names = $request->variable_names(phpbb_request_interface::POST);
$var_names = $request->variable_names(\phpbb\request\request_interface::POST);
$login_link_data = array();
$string_start_length = strlen('login_link_');
@@ -525,7 +525,7 @@ class ucp_register
if (strpos($var_name, 'login_link_') === 0)
{
$key_name = substr($var_name, $string_start_length);
$login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::POST);
$login_link_data[$key_name] = $request->variable($var_name, '', false, \phpbb\request\request_interface::POST);
}
}

52
tests/functional/registration_test.php Normal file
View File

@@ -0,0 +1,52 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @group functional
*/
class phpbb_functional_registration_test extends phpbb_functional_test_case
{
public function test_disable_captcha_on_registration()
{
$this->login();
$this->admin_login();
$crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}");
$form = $crawler->selectButton('Submit')->form();
$form['config[enable_confirm]']->setValue('0');
$crawler = self::submit($form);
$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text());
}
/**
* @depends test_disable_captcha_on_registration
*/
public function test_register_new_account()
{
$this->add_lang('ucp');
$crawler = self::request('GET', 'ucp.php?mode=register');
$this->assertContainsLang('REGISTRATION', $crawler->filter('div.content h2')->text());
$form = $crawler->selectButton('I agree to these terms')->form();
$crawler = self::submit($form);
$form = $crawler->selectButton('Submit')->form(array(
'username' => 'user-reg-test',
'email' => 'user-reg-test@phpbb.com',
'new_password' => 'testtest',
'password_confirm' => 'testtest',
));
$form['tz']->select('Europe/Berlin');
$crawler = self::submit($form);
$this->assertContainsLang('ACCOUNT_ADDED', $crawler->filter('#message')->text());
}
}

2
tests/mock/request.php
View File

@@ -74,7 +74,7 @@ class phpbb_mock_request implements \phpbb\request\request_interface
return array_keys($this->data[$super_global]);
}
public function get_super_global($super_global = phpbb_request_interface::REQUEST)
public function get_super_global($super_global = \phpbb\request\request_interface::REQUEST)
{
return $this->data[$super_global];
}