(REF) HttpTestTrait - Promote `assertBodyRegexp()` from `AllFlowsTest` to `HttpTestTrait`

diff --git a/Civi/Test/HttpTestTrait.php b/Civi/Test/HttpTestTrait.php
index 99e6eb122eff169e6cd1c0cfbda75ff4db0a576a..0f6637a58c116422d8de3d260736a64fad377e5a 100644 (file)
--- a/Civi/Test/HttpTestTrait.php
+++ b/Civi/Test/HttpTestTrait.php
@@ -145,6 +145,22 @@ trait HttpTestTrait {
     return $this;
   }
 
+  /**
+   * @param string $regexp
+   * @param \Psr\Http\Message\ResponseInterface $response
+   * @param string $message
+   */
+  protected function assertBodyRegexp($regexp, $response = NULL, $message = NULL) {
+    if ($message) {
+      $message .= "\n";
+    }
+
+    $response = $this->resolveResponse($response);
+    $this->assertRegexp($regexp, (string) $response->getBody(),
+      $message . 'Response body does not match pattern' . $this->formatFailure($response));
+    return $this;
+  }
+
   /**
    * @param \Psr\Http\Message\ResponseInterface|null $response
    * @return \Psr\Http\Message\ResponseInterface

diff --git a/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php b/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
index 3b63dda50a809d952ac9d9ebb309988b9236bd48..829519037f775c6ddd42dfc48ab55c6a1363ff4e 100644 (file)
--- a/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
+++ b/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
@@ -777,17 +777,6 @@ class AllFlowsTest extends \PHPUnit\Framework\TestCase implements EndToEndInterf
     return $this;
   }
 
-  /**
-   * @param $regexp
-   * @param \Psr\Http\Message\ResponseInterface $response
-   */
-  private function assertBodyRegexp($regexp, $response = NULL) {
-    $response = $this->resolveResponse($response);
-    $this->assertRegexp($regexp, (string) $response->getBody(),
-      'Response body does not match pattern' . $this->formatFailure($response));
-    return $this;
-  }
-
   /**
    * @return int
    * @throws \CiviCRM_API3_Exception