test: increase coverage and fix CI

Author: mowens3

.github/workflows/drupal-module.yml

@@ -49,7 +49,7 @@ jobs:
       SIMPLETEST_DB: "sqlite://localhost/sites/default/files/db.sqlite"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -88,29 +88,29 @@ jobs:
           chmod -R 777 drupal/web/sites/simpletest/browser_output
 
       - name: Run PHPUnit
-        if: ${{ !matrix.coverage || github.ref != 'refs/heads/master' }}
+        if: ${{ !matrix.coverage }}
         run: |
           cd drupal/web
           ../vendor/bin/phpunit -c core modules/contrib/jsonapi_frontend_menu/tests
 
       - name: Run PHPUnit (coverage)
-        if: ${{ matrix.coverage && github.ref == 'refs/heads/master' }}
+        if: ${{ matrix.coverage }}
         run: |
           cd drupal/web
           ../vendor/bin/phpunit -c core modules/contrib/jsonapi_frontend_menu/tests \
             --coverage-clover "$GITHUB_WORKSPACE/coverage.xml" \
             --coverage-filter modules/contrib/jsonapi_frontend_menu
 
       - name: Upload coverage artifact
-        if: ${{ matrix.coverage && github.ref == 'refs/heads/master' }}
+        if: ${{ matrix.coverage }}
         uses: actions/upload-artifact@v4
         with:
           name: coverage-jsonapi_frontend_menu
           path: coverage.xml
           if-no-files-found: error
 
       - name: Upload coverage to Codecov
-        if: ${{ matrix.coverage && github.ref == 'refs/heads/master' }}
+        if: ${{ matrix.coverage }}
         continue-on-error: true
         uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de
         with:

.github/workflows/semgrep.yml

@@ -17,7 +17,7 @@ jobs:
       security-events: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Run Semgrep
         run: |

codecov.yml

@@ -0,0 +1,11 @@
+coverage:
+  status:
+    project:
+      default:
+        target: 0.9
+        threshold: 0.01
+    patch:
+      default:
+        target: 0.9
+        threshold: 0.01
+

tests/src/Kernel/MenuEndpointTest.php

@@ -153,6 +153,22 @@ protected function setUp(): void {
     $login->save();
     $this->ids['login'] = 'menu_link_content:' . $login->uuid();
 
+    $query = MenuLinkContent::create([
+      'title' => 'With Query',
+      'menu_name' => 'main',
+      'link' => [
+        'uri' => 'internal:/about-us',
+        'options' => [
+          'query' => [
+            'utm' => '1',
+          ],
+          'fragment' => 'frag',
+        ],
+      ],
+    ]);
+    $query->save();
+    $this->ids['query'] = 'menu_link_content:' . $query->uuid();
+
     $this->config('jsonapi_frontend.settings')
       ->set('drupal_base_url', 'https://cms.example.com')
       ->save();
@@ -272,6 +288,67 @@ public function testResolveCanBeDisabled(): void {
     $this->assertNull($about['resolve']);
   }
 
+  public function testMenuQueryDepthAndParentOptionsAreHandled(): void {
+    $this->config('jsonapi_frontend.settings')
+      ->set('resolver.cache_max_age', 60)
+      ->set('resolver.langcode_fallback', 'current')
+      ->save();
+
+    $this->container->get('current_user')->setAccount(new AnonymousUserSession());
+
+    $controller = \Drupal\jsonapi_frontend_menu\Controller\MenuController::create($this->container);
+    $request = Request::create('/jsonapi/menu/main', 'GET', [
+      '_format' => 'json',
+      'path' => 'https://www.example.com/about-us/team?utm=1#frag',
+      'min_depth' => '2',
+      'max_depth' => '3',
+      'parent' => $this->ids['about'],
+    ]);
+
+    $response = $controller->menu($request, 'main');
+    $this->assertSame(200, $response->getStatusCode());
+    $this->assertStringContainsString('public', (string) $response->headers->get('Cache-Control'));
+
+    $payload = json_decode((string) $response->getContent(), TRUE);
+    $this->assertIsArray($payload);
+    $this->assertSame([$this->ids['about'], $this->ids['team']], $payload['meta']['active_trail']);
+
+    $team = $this->findItemById($payload['data'], $this->ids['team']);
+    $this->assertNotNull($team);
+  }
+
+  public function testAuthenticatedUserDisablesCaching(): void {
+    $this->config('jsonapi_frontend.settings')
+      ->set('resolver.cache_max_age', 60)
+      ->save();
+
+    $controller = \Drupal\jsonapi_frontend_menu\Controller\MenuController::create($this->container);
+    $request = Request::create('/jsonapi/menu/main', 'GET', [
+      '_format' => 'json',
+    ]);
+
+    $response = $controller->menu($request, 'main');
+    $this->assertSame(200, $response->getStatusCode());
+    $this->assertStringContainsString('no-store', (string) $response->headers->get('Cache-Control'));
+  }
+
+  public function testInternalUrlsAreNormalizedForResolve(): void {
+    $this->container->get('current_user')->setAccount(new AnonymousUserSession());
+
+    $controller = \Drupal\jsonapi_frontend_menu\Controller\MenuController::create($this->container);
+    $request = Request::create('/jsonapi/menu/main', 'GET', [
+      '_format' => 'json',
+    ]);
+
+    $response = $controller->menu($request, 'main');
+    $payload = json_decode((string) $response->getContent(), TRUE);
+
+    $query = $this->findItemById($payload['data'], $this->ids['query']);
+    $this->assertNotNull($query);
+    $this->assertSame('/about-us?utm=1', $query['url']);
+    $this->assertTrue($query['resolve']['resolved']);
+  }
+
   /**
    * Find an item by id in a nested menu tree.
    *