Merge branch '2.1.x'

tests/testframework/ui_test_case.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * @package Board3 Portal Testing
+ * @copyright (c) Board3 Group ( www.board3.de )
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+namespace board3\portal\tests\testframework;
+
+abstract class ui_test_case extends \phpbb_ui_test_case
+{
+	static protected function setup_extensions()
+	{
+		return array('board3/portal');
+	}
+}

tests/ui/portal_visit_ui_test.php

@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 Board3 Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group ui
+*/
+class phpbb_ui_portal_visit_ui_test extends \board3\portal\tests\testframework\ui_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->purge_cache();
+
+		$this->login();
+		$this->admin_login();
+	}
+
+	public function test_vanilla_board()
+	{
+		$this->visit('app.php/portal');
+	}
+}

tests/unit/includes/modules_helper_test.php

@@ -35,6 +35,12 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
 		$request = new \phpbb_mock_request(array('foo' => array('bar')));
 		$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
 		$controller_helper->add_route('board3_portal_controller', 'portal');
+		$phpbb_container = new \phpbb_mock_container_builder();
+		$phpbb_dispatcher = $this->getMock('\phpbb\event\dispatcher', array('trigger_event'), array($phpbb_container));
+		$phpbb_dispatcher->expects($this->any())
+			->method('trigger_event')
+			->with($this->anything())
+			->will($this->returnArgument(1));
 
 		$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, $controller_helper, $request);
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();