V4.6.0

.tests/js/hcaptcha/hcaptcha.test.js

@@ -38,7 +38,7 @@ describe( 'HCaptcha', () => {
 		hCaptcha.foundForms.push( testForm );
 
 		expect( hCaptcha.getFoundFormById( 'test-id' ) ).toEqual( testForm );
-		expect( hCaptcha.getFoundFormById( 'non-existent-id' ) ).toBeUndefined();
+		expect( hCaptcha.getFoundFormById( 'non-existent-id' ) ).toBeNull();
 	} );
 
 	test( 'isSameOrDescendant', () => {
@@ -65,14 +65,14 @@ describe( 'HCaptcha', () => {
 	} );
 
 	test( 'bindEvents and reset', () => {
+		function generateUniqueId() {
+			return Math.random().toString( 36 ).substring( 2, 9 );
+		}
+
 		// Mock hcaptcha object
 		global.hcaptcha = {
-			render: jest.fn( ( hcaptchaElement ) => {
-				// Mock the rendering of the hCaptcha widget by adding a dataset attribute
-				const iframe = document.createElement( 'iframe' );
-				iframe.dataset.hcaptchaWidgetId = 'mock-widget-id';
-				iframe.dataset.hcaptchaResponse = '';
-				hcaptchaElement.appendChild( iframe );
+			render: jest.fn( () => {
+				return generateUniqueId();
 			} ),
 			execute: jest.fn(),
 			reset: jest.fn(),
@@ -132,7 +132,7 @@ describe( 'HCaptcha', () => {
 		hCaptcha.reset( form1 );
 
 		// Check if hcaptcha.reset was called with the correct widget id
-		expect( global.hcaptcha.reset ).toHaveBeenCalledWith( 'mock-widget-id' );
+		expect( global.hcaptcha.reset ).toHaveBeenCalled();
 
 		// Clean up DOM elements
 		document.body.removeChild( form1 );

.tests/php/integration/CF7/AdminTest.php

@@ -47,15 +47,14 @@ public function tearDown(): void {
 	/**
 	 * Test init_hooks().
 	 *
-	 * @param bool $mode_auto  Mode auto.
 	 * @param bool $mode_embed Mode embed.
+	 * @param bool $mode_live  Mode live.
 	 * @param bool $is_admin   Admin mode.
-	 * @param bool $expected   Hooks expected to be added.
 	 *
 	 * @dataProvider dp_test_init_hooks
 	 */
-	public function test_init_hooks( bool $mode_auto, bool $mode_embed, bool $is_admin, bool $expected ): void {
-		$cf7_status = array_filter( [ $mode_auto ? 'form' : '', $mode_embed ? 'embed' : '' ] );
+	public function test_init_hooks( bool $mode_embed, bool $mode_live, bool $is_admin ): void {
+		$cf7_status = array_filter( [ $mode_embed ? 'embed' : '', $mode_live ? 'live' : '' ] );
 		$cf7_screen = 'toplevel_page_wpcf7';
 
 		if ( $is_admin ) {
@@ -76,15 +75,22 @@ public function test_init_hooks( bool $mode_auto, bool $mode_embed, bool $is_adm
 
 		$subject = new Admin();
 
-		if ( $is_admin && $cf7_status ) {
+		if ( $is_admin ) {
 			set_current_screen( $cf7_screen );
 		}
 
-		if ( $expected ) {
+		if ( $mode_embed && $is_admin ) {
 			self::assertSame(
 				54,
 				has_action( 'wpcf7_admin_init', [ $subject, 'add_tag_generator_hcaptcha' ] )
 			);
+		} else {
+			self::assertFalse(
+				has_action( 'wpcf7_admin_init', [ $subject, 'add_tag_generator_hcaptcha' ] )
+			);
+		}
+
+		if ( $mode_live && $is_admin ) {
 			self::assertSame(
 				10,
 				has_action( 'current_screen', [ $subject, 'current_screen' ] )
@@ -106,9 +112,6 @@ public function test_init_hooks( bool $mode_auto, bool $mode_embed, bool $is_adm
 				has_action( 'admin_enqueue_scripts', [ $subject, 'enqueue_admin_scripts_after_cf7' ] )
 			);
 		} else {
-			self::assertFalse(
-				has_action( 'wpcf7_admin_init', [ $subject, 'add_tag_generator_hcaptcha' ] )
-			);
 			self::assertFalse(
 				has_action( 'current_screen', [ $subject, 'current_screen' ] )
 			);
@@ -125,6 +128,24 @@ public function test_init_hooks( bool $mode_auto, bool $mode_embed, bool $is_adm
 		}
 	}
 
+	/**
+	 * Data provider for test_init_hooks().
+	 *
+	 * @return array
+	 */
+	public function dp_test_init_hooks(): array {
+		return [
+			[ false, false, false ],
+			[ false, false, true ],
+			[ false, true, false ],
+			[ false, true, true ],
+			[ true, false, false ],
+			[ true, false, true ],
+			[ true, true, false ],
+			[ true, true, true ],
+		];
+	}
+
 	/**
 	 * Test init_hooks() when not on CF7 admin page.
 	 *
@@ -152,24 +173,6 @@ public function test_init_hooks_NOT_on_cf7_admin_page(): void {
 		);
 	}
 
-	/**
-	 * Data provider for test_init_hooks().
-	 *
-	 * @return array
-	 */
-	public function dp_test_init_hooks(): array {
-		return [
-			[ false, false, false, false ],
-			[ false, false, true, false ],
-			[ false, true, false, false ],
-			[ false, true, true, true ],
-			[ true, false, false, false ],
-			[ true, false, true, true ],
-			[ true, true, false, false ],
-			[ true, true, true, true ],
-		];
-	}
-
 	/**
 	 * Test current_screen().
 	 *

.tests/php/integration/EssentialAddons/BaseTest.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * BaseTest class file.
+ *
+ * @package HCaptcha\Tests
+ */
+
+// phpcs:disable Generic.Commenting.DocComment.MissingShort
+/** @noinspection PhpUndefinedNamespaceInspection */
+/** @noinspection PhpUndefinedClassInspection */
+// phpcs:enable Generic.Commenting.DocComment.MissingShort
+
+namespace HCaptcha\Tests\Integration\EssentialAddons;
+
+use HCaptcha\EssentialAddons\Base;
+use HCaptcha\Tests\Integration\HCaptchaWPTestCase;
+use Mockery;
+use Patchwork\Exceptions\NonNullToVoid;
+use tad\FunctionMocker\FunctionMocker;
+
+/**
+ * Class BaseTest
+ *
+ * @group essential-addons
+ * @group essential-addons-login
+ */
+class BaseTest extends HCaptchaWPTestCase {
+
+	/**
+	 * Tear down the test.
+	 *
+	 * @return void
+	 */
+	public function tearDown(): void {
+		unset( $_GET['elementor-preview'] );
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Test enqueue_scripts().
+	 *
+	 * @return void
+	 */
+	public function test_enqueue_scripts(): void {
+		$subject = Mockery::mock( Base::class );
+
+		$subject->makePartial();
+
+		$subject->enqueue_scripts();
+
+		self::assertFalse( wp_script_is( 'admin-essential-addons' ) );
+
+		$_GET['elementor-preview'] = '4242';
+
+		$subject->enqueue_scripts();
+
+		self::assertTrue( wp_script_is( 'admin-essential-addons' ) );
+	}
+
+	/**
+	 * Test print_hcaptcha_scripts().
+	 *
+	 * @return void
+	 */
+	public function test_print_hcaptcha_scripts(): void {
+		$subject = Mockery::mock( Base::class );
+
+		$subject->makePartial();
+
+		self::assertFalse( $subject->print_hcaptcha_scripts( false ) );
+		self::assertTrue( $subject->print_hcaptcha_scripts( true ) );
+
+		$_GET['elementor-preview'] = '4242';
+
+		self::assertTrue( $subject->print_hcaptcha_scripts( false ) );
+		self::assertTrue( $subject->print_hcaptcha_scripts( true ) );
+	}
+}

.tests/php/integration/EssentialAddons/LoginTest.php

@@ -62,6 +62,9 @@ public function test_init_hooks(): void {
 			has_action( 'eael/login-register/before-login-footer', [ $subject, 'add_login_hcaptcha' ] )
 		);
 		self::assertSame( 10, has_action( 'eael/login-register/before-login', [ $subject, 'verify' ] ) );
+
+		self::assertSame( 10, has_action( 'wp_enqueue_scripts', [ $subject, 'enqueue_scripts' ] ) );
+		self::assertSame( 10, has_action( 'hcap_print_hcaptcha_scripts', [ $subject, 'print_hcaptcha_scripts' ] ) );
 	}
 
 	/**

.tests/php/integration/EssentialAddons/RegisterTest.php

@@ -52,6 +52,9 @@ public function test_init_hooks(): void {
 		self::assertSame( 10, has_action( 'eael/login-register/before-register', [ $subject, 'verify' ] ) );
 
 		self::assertSame( 10, has_action( 'wp_head', [ $subject, 'print_inline_styles' ] ) );
+
+		self::assertSame( 10, has_action( 'wp_enqueue_scripts', [ $subject, 'enqueue_scripts' ] ) );
+		self::assertSame( 10, has_action( 'hcap_print_hcaptcha_scripts', [ $subject, 'print_hcaptcha_scripts' ] ) );
 	}
 
 	/**