Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/102] Cover moving modules more and fix functional tests

Browse Source 
B3P-102
This commit is contained in:
Marc Alexander
2014-04-08 00:19:18 +02:00
parent 69c748e1e4
commit 2da97611a7
4 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acp/portal_module.php
View File

@@ -874,6 +874,7 @@ class portal_module
*/
public function move_module_up($module_id)
{
$updated = false;
$module_data = $this->get_move_module_data($module_id);
if (($module_data !== false) && ($module_data['module_order'] > 1))
@@ -904,6 +905,7 @@ class portal_module
*/
public function move_module_down($module_id)
{
$updated = false;
$module_data = $this->get_move_module_data($module_id);
if ($module_data !== false && $this->get_last_module_order($module_data['module_column']) != $module_data['module_order'])

14
tests/acp/move_module_test.php
View File

@@ -15,11 +15,13 @@ require_once(dirname(__FILE__) . '/../../acp/portal_module.php');
class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\database_test_case
{
static public $redirected = false;
static public $error = false;
static public $override_trigger_error = false;
public function setUp()
{
parent::setUp();
global $db, $cache, $phpbb_root_path, $phpEx, $user, $phpbb_container, $template;
global $db, $cache, $phpbb_root_path, $phpEx, $user, $phpbb_container, $request, $template;
$user = new \board3\portal\tests\mock\user();
$phpbb_container = new \phpbb_mock_container_builder();
// Mock version check
@@ -55,6 +57,7 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
'UNABLE_TO_MOVE' => 'UNABLE_TO_MOVE',
'UNABLE_TO_MOVE_ROW' => 'UNABLE_TO_MOVE_ROW',
));
$request = new \phpbb_mock_request;
$this->portal_module = new \board3\portal\acp\portal_module();
$this->update_portal_modules();
}
@@ -283,3 +286,12 @@ function adm_back_link($url)
{
return $url;
}
function trigger_error($input, $type = E_USER_NOTICE)
{
if (!phpbb_acp_move_module_test::$override_trigger_error)
{
\trigger_error($input, $type);
}
phpbb_acp_move_module_test::$error = $input;
}

22
tests/functional/portal_acp_test.php
View File

@@ -34,6 +34,26 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor
*/
public function test_acp_pages($mode)
{
$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=' . $mode . '&sid=' . $this->sid);
$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=' . $mode . '&sid=' . $this->sid);
}
public function test_move_first_module_up()
{
$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&sid=' . $this->sid);
$module_link = $crawler->filter('table')->eq(3)->filter('tr')->eq(1)->filter('a')->eq(0)->attr('href');
preg_match('/module_id=(?:([0-9]{1,3}))/', $module_link, $output);
$this->assertNotEmpty($output[1]);
$module_id = $output[1];
$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&module_id=' . $module_id . '&action=move_up&sid=' . $this->sid);
}
public function test_move_last_module_down()
{
$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&sid=' . $this->sid);
$module_link = $crawler->filter('table')->eq(3)->filter('tr')->last()->filter('a')->eq(0)->attr('href');
preg_match('/module_id=(?:([0-9]{1,3}))/', $module_link, $output);
$this->assertNotEmpty($output[1]);
$module_id = $output[1];
$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&module_id=' . $module_id . '&action=move_down&sid=' . $this->sid);
}
}

9
tests/mock/user.php
View File

@@ -30,6 +30,15 @@ class user extends \PHPUnit_Framework_TestCase
return; // can't support other extensions
}
if (is_array($file))
{
foreach ($file as $cur_file)
{
$this->add_lang_ext($ext, $cur_file);
}
return;
}
if (file_exists(dirname(__FILE__) . '/../../language/en/' . $file . '.php'))
{
include_once(dirname(__FILE__) . '/../../language/en/' . $file . '.php');