hCaptcha
diff --git a/‎.tests/js/assets-js-files/hcaptcha-beaver-builder.test.js‎
Lines changed: 15 additions & 0 deletions b/‎.tests/js/assets-js-files/hcaptcha-beaver-builder.test.js‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎.tests/js/assets-js-files/hcaptcha-divi.test.js‎
Lines changed: 10 additions & 0 deletions b/‎.tests/js/assets-js-files/hcaptcha-divi.test.js‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎.tests/js/assets-js-files/hcaptcha-support-candy.test.js‎
Lines changed: 7 additions & 0 deletions b/‎.tests/js/assets-js-files/hcaptcha-support-candy.test.js‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.tests/js/assets-js-files/ncaptcha-nf.test.js‎
Lines changed: 7 additions & 0 deletions b/‎.tests/js/assets-js-files/ncaptcha-nf.test.js‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.tests/js/hcaptcha/hcaptcha.test.js‎
Lines changed: 7 additions & 0 deletions b/‎.tests/js/hcaptcha/hcaptcha.test.js‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.tests/php/integration/AAAMainTest.php‎
Lines changed: 9 additions & 3 deletions b/‎.tests/php/integration/AAAMainTest.php‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎.tests/php/integration/Admin/NotificationsTest.php‎
Lines changed: 24 additions & 0 deletions b/‎.tests/php/integration/Admin/NotificationsTest.php‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎.tests/php/integration/MainPluginFileTest.php‎
Lines changed: 0 additions & 2 deletions b/‎.tests/php/integration/MainPluginFileTest.php‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎.tests/php/integration/Migrations/MigrationsTest.php‎
Lines changed: 53 additions & 0 deletions b/‎.tests/php/integration/Migrations/MigrationsTest.php‎
Lines changed: 53 additions & 0 deletions
diff --git a/‎.tests/php/unit/HCaptchaTestCase.php‎
Lines changed: 88 additions & 4 deletions b/‎.tests/php/unit/HCaptchaTestCase.php‎
Lines changed: 88 additions & 4 deletions
@@ -12,6 +12,13 @@ describe( 'hCaptcha Beaver Builder', () => {
 	};
 
 	beforeEach( () => {
+		global.wp = {
+			hooks: {
+				addFilter: jest.fn(),
+				applyFilters: jest.fn( ( hook, content ) => content ),
+			},
+		};
+
 		// Mock jQuery.ajaxPrefilter
 		$.ajaxPrefilter = jest.fn( ( callback ) => {
 			ajaxPrefilterCallback = callback;
@@ -49,4 +56,12 @@ describe( 'hCaptcha Beaver Builder', () => {
 		expect( options.data ).not.toContain( 'hcaptcha_beaver_builder_nonce' );
 		expect( options.data ).not.toContain( 'hcaptcha_login_nonce' );
 	} );
+
+	test( 'does not append anything when data is not a string', () => {
+		options.data = {};
+		ajaxPrefilterCallback( options );
+		expect( options.data ).not.toContain( 'h-captcha-response' );
+		expect( options.data ).not.toContain( 'hcaptcha_beaver_builder_nonce' );
+		expect( options.data ).not.toContain( 'hcaptcha_login_nonce' );
+	} );
 } );
@@ -27,4 +27,14 @@ describe( 'hCaptcha ajaxStop binding', () => {
 		$( document ).trigger( 'ajaxSuccess', [ xhr, settings ] );
 		expect( hCaptchaBindEvents ).toHaveBeenCalledTimes( 1 );
 	} );
+
+	test( 'hCaptchaBindEvents is not called when ajaxSuccess event is triggered with unexpected data', () => {
+		const xhr = {};
+		const settings = {};
+
+		// Unexpected object having data which is not a string.
+		settings.data = {};
+		$( document ).trigger( 'ajaxSuccess', [ xhr, settings ] );
+		expect( hCaptchaBindEvents ).not.toHaveBeenCalled();
+	} );
 } );
@@ -9,6 +9,13 @@ describe( 'hCaptcha ajaxStop binding', () => {
 	let hCaptchaBindEvents;
 
 	beforeEach( () => {
+		global.wp = {
+			hooks: {
+				addFilter: jest.fn(),
+				applyFilters: jest.fn( ( hook, content ) => content ),
+			},
+		};
+
 		hCaptchaBindEvents = jest.fn();
 		global.hCaptchaBindEvents = hCaptchaBindEvents;
 
 
@@ -14,6 +14,13 @@ describe( 'Ninja Forms hCaptcha', () => {
 	let controller;
 
 	beforeEach( () => {
+		global.wp = {
+			hooks: {
+				addFilter: jest.fn(),
+				applyFilters: jest.fn( ( hook, content ) => content ),
+			},
+		};
+
 		require( '../../../assets/js/hcaptcha-nf.js' );
 
 		// Execute DOMContentLoaded event
 
@@ -16,6 +16,13 @@ describe( 'HCaptcha', () => {
 
 	beforeEach( () => {
 		hCaptcha = new HCaptcha();
+
+		global.wp = {
+			hooks: {
+				addFilter: jest.fn(),
+				applyFilters: jest.fn( ( hook, content ) => content ),
+			},
+		};
 	} );
 
 	test( 'GenerateID', () => {
 
@@ -41,6 +41,7 @@
 use ReflectionException;
 use stdClass;
 use tad\FunctionMocker\FunctionMocker;
+use HCaptcha\Admin\PluginStats;
 use HCaptcha\Admin\Events\Events;
 
 /**
@@ -648,6 +649,7 @@ public function test_get_api_src() {
 				'image_host'           => 'imgs-cn1.hcaptcha.com',
 				'report_api'           => 'reportapi-cn1.hcaptcha.com',
 				'sentry'               => 'cn1.hcaptcha.com',
+				'license'              => 'pro',
 			]
 		);
 
@@ -862,6 +864,7 @@ function delayedLoad() {
 				// phpcs:ignore WordPress.WP.AlternativeFunctions.json_encode_json_encode
 				'config_params'        => json_encode( $config_params ),
 				'delay'                => - 100,
+				'license'              => 'pro',
 			]
 		);
 
@@ -878,7 +881,7 @@ function delayedLoad() {
 
 		$script = wp_scripts()->registered['hcaptcha'];
 		self::assertSame( HCAPTCHA_URL . '/assets/js/apps/hcaptcha.js', $script->src );
-		self::assertSame( [], $script->deps );
+		self::assertSame( [ 'wp-hooks' ], $script->deps );
 		self::assertSame( HCAPTCHA_VERSION, $script->ver );
 		self::assertSame( $expected_extra, $script->extra );
 
@@ -907,7 +910,7 @@ function delayedLoad() {
 
 		$script = wp_scripts()->registered['hcaptcha'];
 		self::assertSame( HCAPTCHA_URL . '/assets/js/apps/hcaptcha.js', $script->src );
-		self::assertSame( [], $script->deps );
+		self::assertSame( [ 'wp-hooks' ], $script->deps );
 		self::assertSame( HCAPTCHA_VERSION, $script->ver );
 		self::assertSame( $expected_extra, $script->extra );
 
@@ -1073,7 +1076,10 @@ static function () use ( &$activate ) {
 
 		// Test with hCaptcha plugin not active.
 		$subject->load_modules();
-		$expected_loaded_classes = [];
+		$expected_loaded_classes = [
+			PluginStats::class,
+			Events::class,
+		];
 		$loaded_classes          = $this->get_protected_property( $subject, 'loaded_classes' );
 
 		self::assertSame( $expected_loaded_classes, array_keys( $loaded_classes ) );
 
@@ -94,6 +94,30 @@ public function test_init( bool $empty_keys ) {
 					'text' => 'Get started',
 				],
 			],
+			'statistics'          => [
+				'title'   => 'Events statistics and Forms admin page',
+				'message' => '<a href="http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=general#statistics_1" target="_blank">Turn on</a> events statistics and <a href="http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=forms" target="_blank">see</a> how your forms are used.',
+				'button'  => [
+					'url'  => 'http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=general#statistics_1',
+					'text' => 'Turn on stats',
+				],
+			],
+			'events_page'         => [
+				'title'   => 'Events admin page',
+				'message' => '<a href="http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=general#statistics_1" target="_blank">Turn on</a> events statistics and <a href="https://dashboard.hcaptcha.com/?r=wp&utm_source=wordpress&utm_medium=wpplugin&utm_campaign=not" target="_blank">upgrade to Pro</a> to <a href="http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=events" target="_blank">see</a> complete statistics on form events.',
+				'button'  => [
+					'url'  => 'http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=general#statistics_1',
+					'text' => 'Turn on stats',
+				],
+			],
+			'force'               => [
+				'title'   => 'Force hCaptcha',
+				'message' => 'Force hCaptcha check before submitting the form and simplify the user experience.',
+				'button'  => [
+					'url'  => 'http://test.test/wp-admin/options-general.php?page=hcaptcha&tab=general#force_1',
+					'text' => 'Turn on force',
+				],
+			],
 		];
 
 		if ( ! $empty_keys ) {
 
@@ -60,8 +60,6 @@ public function test_main_file_content() {
 		self::assertTrue( function_exists( 'hcaptcha_get_verify_message_html' ) );
 
 		// functions.php was required.
-		self::assertTrue( function_exists( 'hcap_form' ) );
-		self::assertTrue( function_exists( 'hcap_form_display' ) );
 		self::assertTrue( function_exists( 'hcap_shortcode' ) );
 		self::assertTrue( shortcode_exists( 'hcaptcha' ) );
 	}
 
@@ -7,6 +7,7 @@
 
 namespace HCaptcha\Tests\Integration\Migrations;
 
+use HCaptcha\Admin\Events\Events;
 use HCaptcha\Migrations\Migrations;
 use HCaptcha\Tests\Integration\HCaptchaWPTestCase;
 use Mockery;
@@ -111,7 +112,11 @@ public function test_migrate() {
 			'woocommerce_wishlists_status' => [],
 			'wpforms_status'               => [ 'form' ],
 			'wpforo_status'                => [],
+			'force'                        => [],
 			'custom_themes'                => [],
+			'statistics'                   => [],
+			'collect_ip'                   => [],
+			'collect_ua'                   => [],
 			'_network_wide'                => [],
 		];
 
@@ -180,4 +185,52 @@ public function test_migrate_360_when_wpforms_status_not_set() {
 
 		self::assertSame( $option, get_option( 'hcaptcha_settings', [] ) );
 	}
+
+	/**
+	 * Test migrate_4_0_0().
+	 *
+	 * @return void
+	 * @throws ReflectionException ReflectionException.
+	 */
+	public function test_migrate_4_0_0() {
+		global $wpdb;
+
+		$method          = 'migrate_4_0_0';
+		$subject         = Mockery::mock( Migrations::class )->makePartial();
+		$table_name      = Events::TABLE_NAME;
+		$charset_collate = $wpdb->get_charset_collate();
+		$actual_query    = '';
+		$expected_query  = "CREATE TABLE IF NOT EXISTS $wpdb->prefix$table_name (
+		    id          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+		    source      VARCHAR(256)    NOT NULL,
+		    form_id     VARCHAR(20)     NOT NULL,
+		    ip          VARCHAR(39)     NOT NULL,
+		    user_agent  VARCHAR(256)    NOT NULL,
+		    uuid        VARCHAR(36)     NOT NULL,
+		    error_codes VARCHAR(256)    NOT NULL,
+		    date_gmt    DATETIME        NOT NULL,
+		    PRIMARY KEY (id),
+		    KEY source (source),
+		    KEY form_id (form_id),
+		    KEY hcaptcha_id (source, form_id),
+		    KEY ip (ip),
+		    KEY uuid (uuid),
+		    KEY date_gmt (date_gmt)
+		) $charset_collate;";
+
+		add_filter(
+			'dbdelta_queries',
+			static function ( $queries ) use ( &$actual_query ) {
+				$actual_query = $queries;
+
+				return $queries;
+			}
+		);
+
+		$this->set_method_accessibility( $subject, $method );
+
+		$subject->$method();
+
+		self::assertSame( array_filter( explode( ';', $expected_query ) ), $actual_query );
+	}
 }
@@ -293,10 +293,6 @@ protected function get_test_settings(): array {
 				[],
 			'recaptcha_compat_off'         =>
 				[],
-			'custom_theme_params'          => '{
-   "theme": "dark",
-   "size": "compact"
-}',
 			'config_params'                => '',
 			'whitelisted_ips'              => '4444444.777.2
 220.45.45.1
@@ -541,6 +537,15 @@ protected function get_test_general_form_fields(): array {
 				'default' => General::MODE_LIVE,
 				'helper'  => 'Select live or test mode. In test mode, predefined keys are used.',
 			],
+			'force'                    => [
+				'label'   => 'Force hCaptcha',
+				'type'    => 'checkbox',
+				'section' => General::SECTION_APPEARANCE,
+				'options' => [
+					'on' => 'Force hCaptcha',
+				],
+				'helper'  => 'Force hCaptcha check before submit.',
+			],
 			'custom_themes'            => [
 				'label'   => 'Custom Themes',
 				'type'    => 'checkbox',
@@ -561,6 +566,19 @@ protected function get_test_general_form_fields(): array {
 					)
 				),
 			],
+			'custom_prop'              => [
+				'label'   => 'Property',
+				'type'    => 'select',
+				'options' => [],
+				'section' => 'custom',
+				'helper'  => 'Select custom theme property.',
+			],
+			'custom_value'             => [
+				'label'   => 'Value',
+				'type'    => 'text',
+				'section' => 'custom',
+				'helper'  => 'Set property value.',
+			],
 			'config_params'            => [
 				'label'   => 'Config Params',
 				'type'    => 'textarea',
@@ -680,6 +698,32 @@ protected function get_test_general_form_fields(): array {
 				'step'    => 100,
 				'helper'  => 'Delay time for loading the hCaptcha API script. Any negative value will prevent the API script from loading until user interaction: mouseenter, click, scroll or touch. This significantly improves Google Pagespeed Insights score.',
 			],
+			'statistics'               => [
+				'label'   => 'Statistics',
+				'type'    => 'checkbox',
+				'section' => General::SECTION_STATISTICS,
+				'options' => [
+					'on' => 'Enable Statistics',
+				],
+				'helper'  => 'By turning the statistics on, you agree to the collection of non-personal data to improve the plugin.',
+			],
+			'collect_ip'               => [
+				'label'   => 'Collection',
+				'type'    => 'checkbox',
+				'section' => General::SECTION_STATISTICS,
+				'options' => [
+					'on' => 'Collect IP',
+				],
+				'helper'  => 'Allow collecting of IP addresses from which forms were sent.',
+			],
+			'collect_ua'               => [
+				'type'    => 'checkbox',
+				'section' => General::SECTION_STATISTICS,
+				'options' => [
+					'on' => 'Collect User Agent',
+				],
+				'helper'  => 'Allow collecting of User Agent headers of users sending forms.',
+			],
 		];
 
 		if ( ! ( function_exists( 'is_multisite' ) && is_multisite() ) ) {
@@ -873,6 +917,14 @@ protected function get_test_integrations_form_fields(): array {
 							'login' => 'Login',
 						],
 				],
+			'essential_addons_status'          => [
+				'label'   => 'Essential Addons',
+				'type'    => 'checkbox',
+				'options' => [
+					'login'    => 'Login',
+					'register' => 'Register',
+				],
+			],
 			'fluent_status'                    =>
 				[
 					'label'   => 'Fluent Forms',
@@ -1197,4 +1249,36 @@ protected function get_test_integrations_form_fields(): array {
 				],
 		];
 	}
+
+	/**
+	 * Sort fields. First, by enabled status, then by label.
+	 *
+	 * @param array $fields Fields.
+	 *
+	 * @return array
+	 */
+	public function sort_fields( array $fields ): array {
+		uasort(
+			$fields,
+			static function ( $a, $b ) {
+				$a_disabled = $a['disabled'] ?? false;
+				$b_disabled = $b['disabled'] ?? false;
+
+				$a_label = strtolower( $a['label'] ?? '' );
+				$b_label = strtolower( $b['label'] ?? '' );
+
+				if ( $a_disabled === $b_disabled ) {
+					return $a_label <=> $b_label;
+				}
+
+				if ( ! $a_disabled && $b_disabled ) {
+					return -1;
+				}
+
+				return 1;
+			}
+		);
+
+		return $fields;
+	}
 }
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function test_main_file_content() {`
`60`	`60`	`self::assertTrue( function_exists( 'hcaptcha_get_verify_message_html' ) );`
`61`	`61`
`62`	`62`	`// functions.php was required.`
`63`		`- self::assertTrue( function_exists( 'hcap_form' ) );`
`64`		`- self::assertTrue( function_exists( 'hcap_form_display' ) );`
`65`	`63`	`self::assertTrue( function_exists( 'hcap_shortcode' ) );`
`66`	`64`	`self::assertTrue( shortcode_exists( 'hcaptcha' ) );`
`67`	`65`	`}`