From 8f6ac59c977764c00832118135ffc1cc93680991 Mon Sep 17 00:00:00 2001 From: Florent DUBOST Date: Fri, 11 Oct 2013 16:18:02 +0200 Subject: [PATCH] Adding test for named resource --- Tests/Extractor/ApiDocExtractorTest.php | 9 +++++++-- Tests/Fixtures/Controller/TestController.php | 9 +++++++++ Tests/Fixtures/app/config/routing.yml | 4 ++++ Tests/Formatter/MarkdownFormatterTest.php | 6 ++++++ Tests/Formatter/SimpleFormatterTest.php | 11 +++++++++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/Tests/Extractor/ApiDocExtractorTest.php b/Tests/Extractor/ApiDocExtractorTest.php index 1948c36..2dc4f19 100644 --- a/Tests/Extractor/ApiDocExtractorTest.php +++ b/Tests/Extractor/ApiDocExtractorTest.php @@ -15,7 +15,7 @@ use Nelmio\ApiDocBundle\Tests\WebTestCase; class ApiDocExtractorTest extends WebTestCase { - const ROUTES_QUANTITY = 20; + const ROUTES_QUANTITY = 21; public function testAll() { @@ -66,8 +66,13 @@ class ApiDocExtractorTest extends WebTestCase $this->assertFalse(isset($array2['filters'])); $this->assertEquals('Nelmio\ApiDocBundle\Tests\Fixtures\Form\TestType', $a2->getInput()); - $a3 = $data['13']['annotation']; + $a4 = $data[5]['annotation']; + $this->assertTrue($a4->isResource()); + $this->assertEquals('TestResource', $a4->getResource()); + + $a3 = $data['14']['annotation']; $this->assertTrue($a3->getHttps()); + } public function testGet() diff --git a/Tests/Fixtures/Controller/TestController.php b/Tests/Fixtures/Controller/TestController.php index ea86559..c9e1eae 100644 --- a/Tests/Fixtures/Controller/TestController.php +++ b/Tests/Fixtures/Controller/TestController.php @@ -19,6 +19,15 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; class TestController { + /** + * @ApiDoc( + * resource="TestResource" + * ) + */ + public function namedResourceAction() + { + } + /** * @ApiDoc( * resource=true, diff --git a/Tests/Fixtures/app/config/routing.yml b/Tests/Fixtures/app/config/routing.yml index fcbf561..fb71259 100644 --- a/Tests/Fixtures/app/config/routing.yml +++ b/Tests/Fixtures/app/config/routing.yml @@ -121,3 +121,7 @@ test_route_17: test_return_nested_output: pattern: /return-nested-output defaults: { _controller: NelmioApiDocTestBundle:Test:jmsReturnNestedOutput, _format: json } + +test_route_named_resource: + pattern: /named-resource + defaults: { _controller: NelmioApiDocTestBundle:Test:namedResource } diff --git a/Tests/Formatter/MarkdownFormatterTest.php b/Tests/Formatter/MarkdownFormatterTest.php index 65d4571..dde1296 100644 --- a/Tests/Formatter/MarkdownFormatterTest.php +++ b/Tests/Formatter/MarkdownFormatterTest.php @@ -138,6 +138,12 @@ _post test 2_ +## TestResource ## + +### `ANY` /named-resource ### + + + ### `POST` /another-post ### _create another test_ diff --git a/Tests/Formatter/SimpleFormatterTest.php b/Tests/Formatter/SimpleFormatterTest.php index 6eba5a1..cf05031 100644 --- a/Tests/Formatter/SimpleFormatterTest.php +++ b/Tests/Formatter/SimpleFormatterTest.php @@ -844,6 +844,17 @@ With multiple lines.', 'deprecated' => false, ), ), + 'TestResource' => + array( + 0 => + array( + 'method' => 'ANY', + 'uri' => '/named-resource', + 'https' => false, + 'authentication' => false, + 'deprecated' => false, + ), + ), ); $this->assertEquals($expected, $result);