Merge pull request #466 from marc1706/ticket/465

[ticket/465] Use path instead of pattern in routing.yml
This commit is contained in:
Marc Alexander
2015-02-11 12:08:26 +01:00
2 changed files with 14 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
board3_portal_controller:
pattern: /portal
path: /portal
defaults: { _controller: board3.portal.main:handle }
# This is currently not supported yet
@@ -9,5 +9,5 @@ board3_portal_controller:
# Redirect to portal by default
board3_portal_redirect_controller:
pattern: /
path: /
defaults: { _controller: board3.portal.main:handle }

View File

@@ -28,7 +28,18 @@ class phpbb_functional_portal_no_error_test extends \board3\portal\tests\testfra
public function test_enable_subsilver()
{
$crawler = self::request('GET', 'adm/index.php?i=acp_styles&mode=install&sid=' . $this->sid);
$link = $crawler->selectLink('Install style')->link()->getUri();
$links = $crawler->filter('.actions a');
$link = $links->selectLink('Install style')->link()->getUri();
for ($i = 0; $i < sizeof($links); $i++)
{
$link = $links->eq($i)->selectLink('Install style')->link()->getUri();
if (strpos($link, 'subsilver2') !== false)
{
break;
}
}
$crawler = self::request('GET', substr($link, strpos($link, '/adm') + 1));
$this->assertContains('Style "subsilver2" has been installed', $crawler->text());
}