Fix metadata test

tvdijen · tvdijen · commit 05d012750d77 · 2022-05-28T20:54:18.000+02:00
diff --git a/modules/saml/routing/routes/routes.yaml b/modules/saml/routing/routes/routes.yaml
@@ -32,7 +32,7 @@ websso-single-sign-on:
     path:       /idp/singleSignOnService
     defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\WebBrowserSingleSignOn::singleSignOnService' }
 websso-artifact-resolution:
-    path:       //idp/artifactResolutionService
+    path:       /idp/artifactResolutionService
     defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\WebBrowserSingleSignOn::artifactResolutionService' }
 websso-metadata:
     path:       /idp/metadata
diff --git a/tests/modules/saml/lib/Controller/MetadataTest.php b/tests/modules/saml/lib/Controller/MetadataTest.php
@@ -10,7 +10,7 @@
 use SimpleSAML\Module\saml\Controller;
 use SimpleSAML\Session;
 use SimpleSAML\Utils;
-//use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -84,14 +84,19 @@ public function requireAdmin(): void
      */
     public function testMetadataAccess(bool $authenticated, bool $protected): void
     {
-        $c = new Controller\ServiceProvider($this->config, $this->session);
+        $request = Request::create(
+            '/idp/metadata',
+            'GET',
+        );
+
+        $c = new Controller\Metadata($this->config, $this->session);
 
         if ($authenticated === true || $protected === false) {
             // Bypass authentication - mock being authenticated
             $c->setAuthUtils($this->authUtils);
         }
 
-        $result = $c->metadata('phpunit');
+        $result = $c->metadata($request);
 
         if ($authenticated !== false && $protected !== true) {
             // ($authenticated === true) or ($protected === false)
