Update FluentForm tests.

Author: hCaptcha GHA

.tests/php/integration/FluentForm/FormTest.php

@@ -20,7 +20,6 @@
 use ReflectionException;
 use stdClass;
 use tad\FunctionMocker\FunctionMocker;
-use FluentForm\App\Modules\Form\FormFieldsParser;
 
 /**
  * Test FluentForm.
@@ -208,6 +207,8 @@ public function test_print_hcaptcha_scripts(): void {
 	 * Test enqueue_scripts().
 	 *
 	 * @return void
+	 * @throws ReflectionException ReflectionException.
+	 * @noinspection ES6ConvertVarToLetConst
 	 */
 	public function test_enqueue_scripts(): void {
 		global $wp_scripts;
@@ -355,15 +356,15 @@ public function test_is_fluent_forms_admin_page(): void {
 
 		$subject->shouldAllowMockingProtectedMethods();
 
-		// Not admin page.
+		// Not an admin page.
 		self::assertFalse( $subject->is_fluent_forms_admin_page() );
 
-		// Not Formidable admin page.
+		// Not a Fluent Forms admin page.
 		set_current_screen( 'some' );
 
 		self::assertFalse( $subject->is_fluent_forms_admin_page() );
 
-		// Success path. Formidable admin pages.
+		// Success path. Fluent Forms admin pages.
 		foreach ( $fluent_forms_admin_pages as $page ) {
 			set_current_screen( $page );
 

.tests/php/integration/Stubs/FluentForm/App/Models/Form.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Form stub file
+ *
+ * @package HCaptcha\Tests
+ */
+
+// phpcs:disable Generic.Commenting.DocComment.MissingShort
+/** @noinspection PhpIllegalPsrClassPathInspection */
+/** @noinspection PhpUndefinedClassInspection */
+// phpcs:enable Generic.Commenting.DocComment.MissingShort
+
+// phpcs:disable WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+
+namespace FluentForm\App\Models;
+
+use stdClass;
+
+/**
+ * Form stub.
+ */
+class Form {
+
+	/**
+	 * Find form by ID.
+	 *
+	 * @param int $form_id Form ID.
+	 *
+	 * @return stdClass
+	 * @noinspection PhpUnusedParameterInspection
+	 */
+	public static function find( int $form_id ): stdClass {
+		return new stdClass();
+	}
+}

.tests/php/integration/Stubs/FluentForm/App/Modules/Form/FormFieldsParser.php

@@ -14,6 +14,7 @@
 
 namespace FluentForm\App\Modules\Form;
 
+use FluentForm\App\Models\Form as FluentForm;
 use stdClass;
 
 /**
@@ -32,12 +33,13 @@ public static function resetData(): void {
 	/**
 	 * Has element.
 	 *
-	 * @param stdClass $form    Form object.
-	 * @param string   $element Element name.
+	 * @param FluentForm|stdClass $form    Form object.
+	 * @param string              $element Element name.
 	 *
 	 * @return bool
+	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public static function hasElement( stdClass $form, string $element ): bool {
-		return true;
+	public static function hasElement( $form, string $element ): bool {
+		return false;
 	}
 }

src/php/FluentForm/Form.php

@@ -390,20 +390,13 @@ public function print_inline_styles(): void {
 	 * @return bool
 	 */
 	protected function has_own_hcaptcha( $form ): bool {
-		FormFieldsParser::resetData();
-
-		if ( FormFieldsParser::hasElement( $form, 'hcaptcha' ) ) {
-			return true;
-		}
-
-		return false;
+		return $this->has_element( $form, 'hcaptcha' );
 	}
 
 	/**
 	 * Get hCaptcha.
 	 *
 	 * @return string
-	 * @noinspection PhpUndefinedMethodInspection
 	 */
 	protected function get_hcaptcha(): string {
 		$form = FluentForm::find( $this->form_id );
@@ -427,11 +420,11 @@ protected function get_hcaptcha(): string {
 	/**
 	 * Whether the form is a login form.
 	 *
-	 * @param FluentForm $form Form.
+	 * @param FluentForm|stdClass $form Form.
 	 *
 	 * @return bool
 	 */
-	private function is_login_form( FluentForm $form ): bool {
+	private function is_login_form( $form ): bool {
 
 		return (
 			has_action( 'fluentform/before_insert_submission' ) &&
@@ -443,16 +436,15 @@ private function is_login_form( FluentForm $form ): bool {
 	/**
 	 * Whether the form has an element.
 	 *
-	 * @param FluentForm $form         Form.
-	 * @param string     $element_name Element name.
+	 * @param FluentForm|stdClass $form         Form.
+	 * @param string              $element_name Element name.
 	 *
 	 * @return bool
-	 * @noinspection PhpUndefinedFieldInspection
 	 */
-	private function has_element( FluentForm $form, string $element_name ): bool {
-		$fields_json = $form->form_fields;
+	private function has_element( $form, string $element_name ): bool {
+		FormFieldsParser::resetData();
 
-		return false !== strpos( $fields_json, '"element":"' . $element_name . '"' );
+		return FormFieldsParser::hasElement( $form, $element_name );
 	}
 
 	/**