Merge pull request #99 from andreaselia/fix/incorrect-uri

add test case to catch uri naming
andreaselia · Apr 2, 2024 · 9a83411 · 9a83411
2 parents dd797eb + daeafda
commit 9a83411
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/Processors/RouteProcessor.php b/src/Processors/RouteProcessor.php
@@ -84,9 +84,7 @@ protected function processRoute(Route $route)
  $routeHeaders[] = $this->authentication->toArray();
  }
 
- $uri = Str::of($route->uri())
- ->after('/')
- ->replaceMatches('/{([[:alnum:]]+)}/', ':$1');
+ $uri = Str::of($route->uri())->replaceMatches('/{([[:alnum:]]+)}/', ':$1');
 
  // if (!$uri->toString()) {
  // return [];

diff --git a/tests/Feature/ExportPostmanTest.php b/tests/Feature/ExportPostmanTest.php
@@ -266,8 +266,6 @@ public function test_php_doc_comment_export()
 
  $this->artisan('export:postman')->assertExitCode(0);
 
- $this->assertTrue(true);
-
  $collection = collect(json_decode(Storage::get('postman/'.config('api-postman.filename')), true)['item']);
 
  $targetRequest = $collection
@@ -277,6 +275,20 @@ public function test_php_doc_comment_export()
  $this->assertEquals($targetRequest['request']['description'], 'This is the php doc route. Which is also multi-line. and has a blank line.');
  }
 
+ public function test_uri_is_correct()
+ {
+ $this->artisan('export:postman')->assertExitCode(0);
+
+ $collection = collect(json_decode(Storage::get('postman/'.config('api-postman.filename')), true)['item']);
+
+ $targetRequest = $collection
+ ->where('name', 'example/phpDocRoute')
+ ->first();
+
+ $this->assertEquals($targetRequest['name'], 'example/phpDocRoute');
+ $this->assertEquals($targetRequest['request']['url']['raw'], '{{base_url}}/example/phpDocRoute');
+ }
+
  public static function providerFormDataEnabled(): array
  {
  return [