1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.1.x'

This commit is contained in:
Marc Alexander
2015-05-28 14:16:11 +02:00
5 changed files with 200 additions and 7 deletions

View File

@@ -0,0 +1,20 @@
acp_bbcodes_actions_append
===
* Location: adm/style/acp_bbcodes.html
* Since: 3.1.0-a3
* Changed: 3.1.0-a4
* Purpose: desc1
acp_bbcodes_actions_prepend
===
* Location: adm/style/acp_bbcodes.html
* Since: 3.1.0-a5
* Purpose: desc2
acp_bbcodes_actions_prepend2
===
* Location: adm/style/acp_bbcodes.html
* Since: 3.1.0-a4
* Changed: 3.1.0-a5 Moved up
* Changed: 3.1.0-a6 Moved down
* Purpose: desc2

View File

@@ -11,10 +11,99 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
class phpbb_event_md_exporter_test extends phpbb_test_case
{
static public function crawl_eventsmd_data()
{
return array(
array('normal_events.md.test', null, null, array(
'acp_bbcodes_actions_append' => array(
'event' => 'acp_bbcodes_actions_append',
'files' => array(
'prosilver' => array(),
'subsilver2' => array(),
'adm' => array('acp_bbcodes.html'),
),
'since' => '3.1.0-a3',
'changed' => array(
'3.1.0-a4' => '',
),
'description' => 'desc1' . "\n",
),
'acp_bbcodes_actions_prepend' => array(
'event' => 'acp_bbcodes_actions_prepend',
'files' => array(
'prosilver' => array(),
'subsilver2' => array(),
'adm' => array('acp_bbcodes.html'),
),
'since' => '3.1.0-a5',
'changed' => array(),
'description' => 'desc2' . "\n",
),
'acp_bbcodes_actions_prepend2' => array(
'event' => 'acp_bbcodes_actions_prepend2',
'files' => array(
'prosilver' => array(),
'subsilver2' => array(),
'adm' => array('acp_bbcodes.html'),
),
'since' => '3.1.0-a4',
'changed' => array(
'3.1.0-a5' => 'Moved up',
'3.1.0-a6' => 'Moved down',
),
'description' => 'desc2' . "\n",
),
)),
array('normal_events.md.test', '3.1.0-a5', '3.1.0-a5', array(
'acp_bbcodes_actions_prepend' => array(
'event' => 'acp_bbcodes_actions_prepend',
'files' => array(
'prosilver' => array(),
'subsilver2' => array(),
'adm' => array('acp_bbcodes.html'),
),
'since' => '3.1.0-a5',
'changed' => array(),
'description' => 'desc2' . "\n",
),
'acp_bbcodes_actions_prepend2' => array(
'event' => 'acp_bbcodes_actions_prepend2',
'files' => array(
'prosilver' => array(),
'subsilver2' => array(),
'adm' => array('acp_bbcodes.html'),
),
'since' => '3.1.0-a4',
'changed' => array(
'3.1.0-a5' => 'Moved up',
'3.1.0-a6' => 'Moved down',
),
'description' => 'desc2' . "\n",
),
)),
);
}
/**
* @dataProvider crawl_eventsmd_data
*
* @param string $file
* @param string $min_version
* @param string $max_version
* @param array $events
*/
public function test_crawl_eventsmd($file, $min_version, $max_version, $events)
{
$exporter = new \phpbb\event\md_exporter(dirname(__FILE__) . '/fixtures/', null, $min_version, $max_version);
$this->assertSame(sizeof($events), $exporter->crawl_eventsmd($file, 'adm'));
$this->assertEquals($events, $exporter->get_events());
}
static public function crawl_phpbb_eventsmd_data()
{
return array(
array('styles'),
@@ -23,9 +112,9 @@ class phpbb_event_md_exporter_test extends phpbb_test_case
}
/**
* @dataProvider crawl_eventsmd_data
*/
public function test_crawl_eventsmd($filter)
* @dataProvider crawl_phpbb_eventsmd_data
*/
public function test_crawl_phpbb_eventsmd($filter)
{
global $phpbb_root_path;
$exporter = new \phpbb\event\md_exporter($phpbb_root_path);