+
+
+ |
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
diff --git a/styles/subsilver2/template/portal/portal_body.html b/styles/subsilver2/template/portal/portal_body.html
index fb7ed515..ee5d5d1d 100644
--- a/styles/subsilver2/template/portal/portal_body.html
+++ b/styles/subsilver2/template/portal/portal_body.html
@@ -1,4 +1,3 @@
-
diff --git a/tests/functional/portal_no_error_test.php b/tests/functional/portal_no_error_test.php
index 481c0fcc..d226a395 100644
--- a/tests/functional/portal_no_error_test.php
+++ b/tests/functional/portal_no_error_test.php
@@ -53,4 +53,59 @@ class phpbb_functional_portal_no_error_test extends \board3\portal\tests\testfra
$this->assertContains('subsilver', $crawler->text());
self::request('GET', 'app.php/portal?style=2');
}
+
+ public function data_portal_all_pages()
+ {
+ return array(
+ array(1),
+ array(2),
+ );
+ }
+
+ /**
+ * @dataProvider data_portal_all_pages
+ * @dependsOn test_enable_subsilver
+ */
+ public function test_portal_all_pages($style_id)
+ {
+ $crawler = self::request('GET', 'index.php?style=' . $style_id);
+ $this->assertNotContains('Menu', $crawler->text());
+
+ $crawler = self::request('GET', 'adm/index.php?i=-board3-portal-acp-portal_module&mode=config&sid=' . $this->sid);
+
+ $form = $crawler->selectButton('submit')->form(array(
+ 'config[board3_show_all_pages]' => 1,
+ 'board3_show_all_side' => 0,
+ ));
+ $crawler = self::submit($form);
+ $this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
+
+ $crawler = self::request('GET', 'index.php?style=' . $style_id);
+ $this->assertContains('Menu', $crawler->text());
+
+ $crawler = self::request('GET', 'adm/index.php?i=-board3-portal-acp-portal_module&mode=config&sid=' . $this->sid);
+
+ $form = $crawler->selectButton('submit')->form(array(
+ 'config[board3_show_all_pages]' => 1,
+ 'board3_show_all_side' => 1,
+ ));
+ $crawler = self::submit($form);
+ $this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
+
+ $crawler = self::request('GET', 'index.php?style=' . $style_id);
+ $this->assertNotContains('Board Style', $crawler->text());
+ $this->assertContains('User menu', $crawler->text());
+
+ $crawler = self::request('GET', 'adm/index.php?i=-board3-portal-acp-portal_module&mode=config&sid=' . $this->sid);
+
+ $form = $crawler->selectButton('submit')->form(array(
+ 'config[board3_show_all_pages]' => 0,
+ 'board3_show_all_side' => 0,
+ ));
+ $crawler = self::submit($form);
+ $this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
+
+ $crawler = self::request('GET', 'index.php?style=' . $style_id);
+ $this->assertNotContains('Menu', $crawler->text());
+ }
}
diff --git a/tests/mock/template.php b/tests/mock/template.php
index 539de39f..8806962f 100644
--- a/tests/mock/template.php
+++ b/tests/mock/template.php
@@ -36,6 +36,16 @@ class template
}
}
+ public function assign_vars($vars)
+ {
+ $this->data = array_merge($this->data, $vars);
+ }
+
+ public function assign_var($key, $var)
+ {
+ $this->data[$key] = $var;
+ }
+
public function assert_equals($data, $row)
{
foreach ($data as $key => $value)
@@ -43,4 +53,9 @@ class template
$this->test_case->assertEquals($value, $this->data[$row][$key]);
}
}
+
+ public function assert_same($expected, $row)
+ {
+ $this->test_case->assertSame($expected, $this->data[$row]);
+ }
}
diff --git a/tests/mock/user.php b/tests/mock/user.php
index eb603e89..b0ca4c45 100644
--- a/tests/mock/user.php
+++ b/tests/mock/user.php
@@ -53,4 +53,9 @@ class user extends \PHPUnit_Framework_TestCase
$this->markTestIncomplete('Unable to include language file ' . $file);
}
}
+
+ public function lang($var)
+ {
+ return $this->lang[$var];
+ }
}
diff --git a/tests/unit/controller/main_test.php b/tests/unit/controller/main_test.php
new file mode 100644
index 00000000..6eb1109f
--- /dev/null
+++ b/tests/unit/controller/main_test.php
@@ -0,0 +1,94 @@
+createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
+ }
+
+ public function setUp()
+ {
+ global $phpbb_root_path, $phpEx, $table_prefix, $cache;
+
+ parent::setUp();
+
+ $path_helper = new \phpbb\path_helper(
+ new \phpbb\symfony_request(
+ new \phpbb_mock_request()
+ ),
+ new \phpbb\filesystem(),
+ new \phpbb_mock_request(),
+ $phpbb_root_path,
+ $phpEx
+ );
+
+ $cache = new \phpbb\cache\driver\null();
+
+ $user = new \board3\portal\tests\mock\user();
+
+ $config_table = $table_prefix . 'portal_config';
+ $modules_table = $table_prefix . 'portal_modules';
+ $this->template = new \board3\portal\tests\mock\template($this);
+ $portal_columns = new \board3\portal\portal\columns();
+ $this->config = new \phpbb\config\config(array('board3_enable' => true));
+ $modules = array(
+ '\board3\portal\modules\clock' => new \board3\portal\modules\clock($this->config, $this->template),
+ );
+ $portal_helper = new \board3\portal\includes\helper($modules);
+ $auth = $this->getMock('\phpbb\auth\auth', array('acl_get'));
+ $auth->expects($this->any())
+ ->method('acl_get')
+ ->with($this->anything())
+ ->will($this->returnValue(true));
+
+ $controller_helper = new \board3\portal\controller\helper(
+ $auth,
+ $portal_columns,
+ $this->config,
+ $this->template,
+ $user,
+ $path_helper,
+ $portal_helper,
+ $phpbb_root_path,
+ '.' . $phpEx
+ );
+
+ $this->controller_main = new \board3\portal\controller\main(
+ $portal_columns,
+ $this->config,
+ $controller_helper,
+ $this->template,
+ $user,
+ $path_helper,
+ $phpbb_root_path,
+ '.' . $phpEx,
+ $config_table,
+ $modules_table
+ );
+ }
+
+ public function test_display_all_pages()
+ {
+ $this->assertNull($this->controller_main->handle(array('left' => 1)));
+ $this->template->assert_same(true, 'S_PORTAL_ALL');
+ }
+}
diff --git a/tests/unit/event/listener_test.php b/tests/unit/event/listener_test.php
index 323fd620..21d87988 100644
--- a/tests/unit/event/listener_test.php
+++ b/tests/unit/event/listener_test.php
@@ -17,6 +17,9 @@ class listener_test extends \phpbb_template_template_test_case
protected $listener;
protected $auth;
+ /** @var \board3\portal\controller\main */
+ protected $controller;
+
static public $hidden_fields = array();
public function setup()
@@ -91,7 +94,12 @@ class listener_test extends \phpbb_template_template_test_case
$this->auth->acl_options['global']['u_view_portal'] = 0;
$this->auth->acl[0][0] = true;
+ $this->controller = $this->getMockBuilder('\board3\portal\controller\main')
+ ->disableOriginalConstructor()
+ ->getMock();
+
$this->listener = new \board3\portal\event\listener(
+ $this->controller,
$this->auth,
$this->config,
$this->controller_helper,
|