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

Merge pull request #662 from marc1706/ticket/660

Browse Source 
[ticket/660] Update tests for recent changes in 3.2.x
This commit is contained in:
Marc Alexander
2015-11-11 10:08:21 +01:00
parent 8388533630 6ac3c6caf3
commit 1df94beaf4
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@@ -1,9 +1,12 @@
# Opt into fully virtualized infrastructure
sudo: required
language: php language: php
matrix: matrix:
include: include:
- php: 5.3 - php: 5.4
env: DB=mysqli # MyISAM env: DB=none;NOTESTS=1
- php: 5.4 - php: 5.4
env: DB=mysqli env: DB=mysqli
- php: 5.4 - php: 5.4
@@ -56,9 +59,9 @@ before_script:
- chmod +wx build/logs - chmod +wx build/logs
script: script:
- sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi" - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $NOTESTS; fi"
- sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi" - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS; fi"
- ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION - sh -c "if [ '$NOTESTS' != '1' ]; then ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION; fi"
- sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi" - sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
after_script: after_script:

9
tests/unit/event/listener_test.php
View File

@@ -76,9 +76,12 @@ class listener_test extends \phpbb_template_template_test_case
$container = new \phpbb_mock_container_builder(); $container = new \phpbb_mock_container_builder();
$filesystem = new \phpbb\filesystem\filesystem(); $filesystem = new \phpbb\filesystem\filesystem();
$router = new \phpbb_mock_router($container, $filesystem, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT, $manager); $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
$router->find_routing_files($manager->all_enabled(false)); new \phpbb\routing\file_locator($filesystem, dirname(__FILE__) . '/')
$router->find(dirname(__FILE__) . '/'); );
$routing_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT);
$router = new \phpbb_mock_router($container, $routing_locator, $loader, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
$routes = $router->get_routes();
$symfony_request = new \phpbb\symfony_request($request); $symfony_request = new \phpbb\symfony_request($request);
$routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, $filesystem, $phpbb_root_path, 'php'); $routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, $filesystem, $phpbb_root_path, 'php');
$this->controller_helper = new mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $routing_helper); $this->controller_helper = new mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $routing_helper);