mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus

Browse Source 
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
This commit is contained in:
Joas Schilling
2014-03-13 10:16:41 +01:00
parent d81a604ef8 e123b0c0a0
commit 03eb23cbae
4 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/functional/acp_users_test.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
/**
*
* @package testing
* @copyright (c) 2014 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @group functional
*/
class phpbb_functional_acp_users_test extends phpbb_functional_test_case
{
public function setUp()
{
parent::setUp();
$this->login();
$this->admin_login();
$this->add_lang('acp/users');
}
public function test_founder_deletion()
{
$username = 'founder-account';
$user_id = $this->create_user($username);
$this->make_founder($user_id);
$crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u=$user_id&sid={$this->sid}");
$form = $crawler->filter('#user_delete')->selectButton($this->lang('SUBMIT'))->form();
$crawler = self::submit($form);
$this->assertContains($this->lang('CANNOT_REMOVE_FOUNDER'), $this->get_content());
}
protected function make_founder($user_id)
{
$crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u=$user_id&sid={$this->sid}");
$form = $crawler->filter('#user_overview')->selectButton($this->lang('SUBMIT'))->form();
$data = array('user_founder' => '1');
$form->setValues($data);
$crawler = self::submit($form);
$this->assertContains($this->lang('USER_OVERVIEW_UPDATED'), $this->get_content());
}
}

9
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -423,6 +423,15 @@ class phpbb_functional_test_case extends phpbb_test_case
$config = array();
}
/*
* Add required config entries to the config array to prevent
* set_config() sending an INSERT query for already existing entries,
* resulting in a SQL error.
* This is because set_config() first sends an UPDATE query, then checks
* sql_affectedrows() which can be 0 (e.g. on MySQL) when the new
* data is already there.
*/
$config['newest_user_colour'] = '';
$config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600;