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

Merge pull request #705 from marc1706/ticket/704

Browse Source 
[ticket/704] Update .travis.yml for travis changes
This commit is contained in:
Marc Alexander
2017-11-04 16:09:28 +01:00
committed by GitHub
parent 049a499843 5857effadd
commit 3f98302449
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -1,4 +1,6 @@
language: php language: php
sudo: required
dist: precise
matrix: matrix:
include: include:
@@ -16,17 +18,16 @@ matrix:
env: DB=postgres env: DB=postgres
- php: 5.4 - php: 5.4
env: DB=sqlite3 env: DB=sqlite3
- php: 5.4
env: DB=mysqli;SLOWTESTS=1
- php: 5.5 - php: 5.5
env: DB=mysqli env: DB=mysqli
- php: 5.6 - php: 5.6
env: DB=mysqli env: DB=mysqli
- php: hhvm - php: hhvm
env: DB=mysqli env: DB=mysqli
- php: 7.0
env: DB=mysqli
allow_failures: allow_failures:
- php: hhvm - php: hhvm
- php: 7.0
fast_finish: true fast_finish: true
env: env:

8
tests/unit/includes/modules_helper_test.php
View File

@@ -26,7 +26,7 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
public function setUp() public function setUp()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx, $phpbb_dispatcher;;
parent::setUp(); parent::setUp();
@@ -35,6 +35,12 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
$request = new \phpbb_mock_request(array('foo' => array('bar'))); $request = new \phpbb_mock_request(array('foo' => array('bar')));
$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx); $controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
$controller_helper->add_route('board3_portal_controller', 'portal'); $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); $this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, $controller_helper, $request);
} }