Skip to content

Commit 2f60d84

Browse files
committed
fix block paths
1 parent f743a7d commit 2f60d84

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

app/AppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function registerBundles()
4040
new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
4141
new Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(),
4242
new Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(),
43-
new \Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\CmfSonataPhpcrAdminIntegrationBundle(),
43+
new Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\CmfSonataPhpcrAdminIntegrationBundle(),
4444

4545
// language switcher
4646
new Lunetics\LocaleBundle\LuneticsLocaleBundle(),

app/config/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ cmf_sonata_phpcr_admin_integration:
128128
menu: ~
129129
core: ~
130130
content: ~
131-
block: ~
131+
block:
132+
basepath: /cms/content
133+
basepath: /cms/content
132134
routing: ~
133135

134136

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/Functional/AdminTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected function doTestReachableAdminRoutes($admin)
132132
$this->client->request('GET', $url);
133133
$res = $this->client->getResponse();
134134

135-
$this->assertResponseSuccess($res);
135+
$this->assertResponseSuccess($res, $url);
136136

137137
$this->testedPatterns[] = $route->getPath();
138138
}

tests/Functional/WebTestCase.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ protected function createClientAuthenticated(array $options = array(), array $se
4747
* Method to assert a 200 response code.
4848
*
4949
* This code is taken from symfony-cmf/Testing.
50+
* @param Response $response
51+
* @param string $url
5052
*/
51-
protected function assertResponseSuccess(Response $response)
53+
protected function assertResponseSuccess(Response $response, $url = '')
5254
{
5355
libxml_use_internal_errors(true);
5456

@@ -62,6 +64,10 @@ protected function assertResponseSuccess(Response $response)
6264
$exception = $result->item(0)->nodeValue;
6365
}
6466

65-
$this->assertEquals(200, $response->getStatusCode(), $exception ? 'Exception: "'.trim($exception).'"' : null);
67+
$this->assertEquals(
68+
200,
69+
$response->getStatusCode(),
70+
$exception ? 'Exception: "'.trim($exception).'" on url: '.$url : null
71+
);
6672
}
6773
}

0 commit comments

Comments
 (0)