Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-06-06 18:17:19 +02:00
23 changed files with 196 additions and 185 deletions

View File

@@ -138,7 +138,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
$this->assertNull($this->modules_manager->reset_module(15, 'barfoo', 6, array()));
$this->assertEquals(array(
'seconds' => 3,
'link' => 'adm/index.php?i=%5Cfoo%5Cbar&mode=config&module_id=6',
'link' => 'adm/index.php?i=-foo-bar&mode=config&module_id=6',
), self::$meta_refresh);
$this->assertEquals(phpbb_acp_move_module_test::$error_type, E_USER_NOTICE);
$this->assertEquals(phpbb_acp_move_module_test::$error, 'adm/index.php?i=15&mode=foobar&module_id=6');

View File

@@ -132,7 +132,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
public function test_get_module_link()
{
$this->modules_manager->set_acp_class('foo\bar')->set_u_action('index.php?i=25&mode=barfoo');
$this->assertEquals('index.php?i=%5Cfoo%5Cbar&mode=test&module_id=5', $this->modules_manager->get_module_link('test', 5));
$this->assertEquals('index.php?i=-foo-bar&mode=test&module_id=5', $this->modules_manager->get_module_link('test', 5));
}
public function test_handle_ajax_request()