From b1f63f190c343efd3af3d66896c7c4df6644410c Mon Sep 17 00:00:00 2001
From: Luciano Righetti <luciano.righetti@gmail.com>
Date: Wed, 19 Jan 2022 16:08:50 +0100
Subject: [PATCH] chg: move openapi validator initialization to
 tests/bootstrap.php so its only parsed once.

---
 tests/Helper/ApiTestTrait.php                 | 24 ++++++++++---------
 .../Api/Users/ChangePasswordApiTest.php       |  2 +-
 tests/bootstrap.php                           |  8 +++++++
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/tests/Helper/ApiTestTrait.php b/tests/Helper/ApiTestTrait.php
index 2060063..a55268c 100644
--- a/tests/Helper/ApiTestTrait.php
+++ b/tests/Helper/ApiTestTrait.php
@@ -5,14 +5,14 @@ declare(strict_types=1);
 namespace App\Test\Helper;
 
 use Cake\TestSuite\IntegrationTestTrait;
-use Cake\Http\Exception\NotImplementedException;
+use Cake\Core\Configure;
 use Cake\Http\ServerRequestFactory;
 use Cake\Http\ServerRequest;
+use Cake\Http\Exception\NotImplementedException;
 use \League\OpenAPIValidation\PSR7\ValidatorBuilder;
 use \League\OpenAPIValidation\PSR7\RequestValidator;
 use \League\OpenAPIValidation\PSR7\ResponseValidator;
 use \League\OpenAPIValidation\PSR7\OperationAddress;
-use PHPUnit\Exception as PHPUnitException;
 
 /**
  * Trait ApiTestTrait
@@ -47,7 +47,7 @@ trait ApiTestTrait
     public function setUp(): void
     {
         parent::setUp();
-        $this->initializeOpenApiValidator($_ENV['OPENAPI_SPEC'] ?? APP . '../webroot/docs/openapi.yaml');
+        $this->initializeOpenApiValidator();
     }
 
     public function setAuthToken(string $authToken): void
@@ -83,16 +83,18 @@ trait ApiTestTrait
     }
 
     /**
-     * Parse the OpenAPI specification and create a validator
+     * Load OpenAPI specification validator
      * 
-     * @param string $specFile
      * @return void
      */
-    public function initializeOpenApiValidator(string $specFile): void
+    public function initializeOpenApiValidator(): void
     {
-        $this->_validator = (new ValidatorBuilder)->fromYamlFile($specFile);
-        $this->_requestValidator = $this->_validator->getRequestValidator();
-        $this->_responseValidator = $this->_validator->getResponseValidator();
+        if (!$this->_skipOpenApiValidations) {
+            $this->_validator =  Configure::read('App.OpenAPIValidator');
+            if ($this->_validator === null) {
+                throw new \Exception('OpenAPI validator is not configured');
+            }
+        }
     }
 
     /**
@@ -102,7 +104,7 @@ trait ApiTestTrait
      */
     public function assertRequestMatchesOpenApiSpec(): void
     {
-        $this->_requestValidator->validate($this->_psrRequest);
+        $this->_validator->getRequestValidator()->validate($this->_psrRequest);
     }
 
     /**
@@ -115,7 +117,7 @@ trait ApiTestTrait
     public function assertResponseMatchesOpenApiSpec(string $endpoint, string $method = 'get'): void
     {
         $address = new OperationAddress($endpoint, $method);
-        $this->_responseValidator->validate($address, $this->_response);
+        $this->_validator->getResponseValidator()->validate($address, $this->_response);
     }
 
     /** 
diff --git a/tests/TestCase/Api/Users/ChangePasswordApiTest.php b/tests/TestCase/Api/Users/ChangePasswordApiTest.php
index fca8339..8dcd517 100644
--- a/tests/TestCase/Api/Users/ChangePasswordApiTest.php
+++ b/tests/TestCase/Api/Users/ChangePasswordApiTest.php
@@ -36,7 +36,7 @@ class ChangePasswordApiTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->initializeOpenApiValidator($_ENV['OPENAPI_SPEC'] ?? APP . '../webroot/docs/openapi.yaml');
+        $this->initializeOpenApiValidator();
 
         $this->collection = new ComponentRegistry();
         $this->auth = new FormAuthenticate($this->collection, [
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 34939c3..7523c28 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -19,6 +19,10 @@ declare(strict_types=1);
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Migrations\TestSuite\Migrator;
+use \League\OpenAPIValidation\PSR7\ValidatorBuilder;
+use \League\OpenAPIValidation\PSR7\RequestValidator;
+use \League\OpenAPIValidation\PSR7\ResponseValidator;
+use \League\OpenAPIValidation\PSR7\OperationAddress;
 
 /**
  * Test runner bootstrap.
@@ -64,3 +68,7 @@ if (!$_ENV['SKIP_DB_MIGRATIONS']) {
 } else {
     echo "[ * ] Skipping DB migrations ...\n";
 }
+
+$specFile = $_ENV['OPENAPI_SPEC'] ?? APP . '../webroot/docs/openapi.yaml';
+// Initialize OpenAPI spec validator
+Configure::write('App.OpenAPIValidator', (new ValidatorBuilder)->fromYamlFile($specFile));