makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15339] Fix tests

Browse source 
PHPBB3-15339
This commit is contained in:
Oliver Schramm 2017-12-24 19:55:03 +01:00
parent 719a49d387
commit 2b16b7cada
2 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/db/migration/tool/module.php
View file

@ -391,7 +391,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
$parent_sql = ''; $parent_sql = '';
if ($parent !== false) if ($parent !== false)
{ {
$parents = (array)$this->get_parent_module_id($parent, $module); $parents = (array) $this->get_parent_module_id($parent, $module);
$parent_sql = 'AND ' . $this->db->sql_in_set('parent_id', $parents); $parent_sql = 'AND ' . $this->db->sql_in_set('parent_id', $parents);
} }

19
tests/dbal/migrator_tool_module_test.php
View file

@ -193,25 +193,6 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
} }
$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE')); $this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE'));
// Test adding module when plural parent module_langname exists
// PHPBB3-14703
// Adding fail
try
{
$this->tool->add('acp', 'ACP_FORUM_BASED_PERMISSIONS', array(
'module_basename' => 'acp_new_permissions_module',
'module_langname' => 'ACP_NEW_PERMISSIONS_MODULE',
'module_mode' => 'test',
'module_auth' => '',
));
$this->fail('Exception not thrown');
}
catch (Exception $e)
{
$this->assertEquals('phpbb\db\migration\exception', get_class($e));
$this->assertEquals('MODULE_EXIST_MULTIPLE', $e->getMessage());
}
// Test adding module when plural parent module_langname exists // Test adding module when plural parent module_langname exists
// PHPBB3-14703 // PHPBB3-14703
// Adding success // Adding success