V3.1.0 (#264)

* Fix example of verify in the readme.txt. * Update CI. * Fix error on CF7 validation. * Bump up version. * Fix checkboxes disabled status after activation of a plugin on the Integrations page. * Fix README.md. * Fix README.md. * Update screenshot-5.png. * Add Notification system. * Fix tests. * Add animated icon on wp.org. * Add animated icon on wp.org. * Add animated icon on wp.org. * Add animated icon on wp.org. * Improve notifications design. * Add reset notification feature. * Add reset notification feature. * Add reset notification feature. * Change notification wording. * Show notification after reset via ajax. * Fix positioning bug when inserting notifications div. * Update readme.txt. * Fix CI after CF7 requirement for PHP 7.4. * Fix mode selection for sample hCaptcha. * Scroll to the ajax message on General. * Bump up version. * Update src/php/Admin/Notifications.php Co-authored-by: e271828- <[email protected]> * Update src/php/Admin/Notifications.php Co-authored-by: e271828- <[email protected]> --------- Co-authored-by: e271828- <[email protected]>
hCaptcha · Aug 8, 2023 · 3bef4f8 · 3bef4f8
1 parent df4b220
commit 3bef4f8
Show file tree

Hide file tree

Showing 19 changed files with 860 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -111,7 +111,7 @@ jobs:
 
       - name: Install plugins
         working-directory: ${{ env.wp-directory }}
-        run: wp plugin install bbpress buddypress contact-form-7 ultimate-member wpforms-lite wpforo
+        run: wp plugin install bbpress buddypress ultimate-member wpforms-lite wpforo
 
       - name: Install plugins requiring 7.1
         if: ${{ matrix.php-version >= '7.1' }}
@@ -123,6 +123,11 @@ jobs:
         working-directory: ${{ env.wp-directory }}
         run: wp plugin install woocommerce
 
+      - name: Install plugins requiring 7.4
+        if: ${{ matrix.php-version >= '7.4' }}
+        working-directory: ${{ env.wp-directory }}
+        run: wp plugin install contact-form-7
+
       - name: Run WP tests
         working-directory: ${{ env.wp-plugin-directory }}
         run: composer integration -- --env github-actions

diff --git a/.tests/php/integration/CF7/CF7Test.php b/.tests/php/integration/CF7/CF7Test.php
@@ -23,6 +23,10 @@
 /**
  * Test CF7 class.
  *
+ * CF7 requires PHP 7.4.
+ *
+ * @requires PHP >= 7.4
+ *
  * @group cf7
  */
 class CF7Test extends HCaptchaPluginWPTestCase {

diff --git a/.tests/php/integration/HCaptchaPluginWPTestCase.php b/.tests/php/integration/HCaptchaPluginWPTestCase.php
@@ -52,8 +52,9 @@ public static function tearDownAfterClass(): void {  // phpcs:ignore PHPCompatib
 	 */
 	public function setUp(): void { // phpcs:ignore PHPCompatibility.FunctionDeclarations.NewReturnTypeDeclarations.voidFound
 		$plugins_requiring_php = [
-			'7.2' => [ 'woocommerce/woocommerce.php' ],
 			'7.1' => [ 'ninja-forms/ninja-forms.php' ],
+			'7.3' => [ 'woocommerce/woocommerce.php' ],
+			'7.4' => [ 'contact-form-7/wp-contact-form-7.php' ],
 		];
 
 		foreach ( $plugins_requiring_php as $php_version => $plugins_requiring_php_version ) {

diff --git a/.tests/php/unit/HCaptchaTestCase.php b/.tests/php/unit/HCaptchaTestCase.php
@@ -383,6 +383,12 @@ protected function get_test_general_form_fields() {
 				'text'    => 'Check',
 				'section' => General::SECTION_KEYS,
 			],
+			'reset_notifications'      => [
+				'label'   => 'Reset Notifications',
+				'type'    => 'button',
+				'text'    => 'Reset',
+				'section' => General::SECTION_KEYS,
+			],
 			'theme'                    => [
 				'label'   => 'Theme',
 				'type'    => 'select',

diff --git a/.tests/php/unit/Settings/GeneralTest.php b/.tests/php/unit/Settings/GeneralTest.php
@@ -12,6 +12,7 @@
 
 namespace HCaptcha\Tests\Unit\Settings;
 
+use HCaptcha\Admin\Notifications;
 use HCaptcha\Main;
 use HCaptcha\Settings\Abstracts\SettingsBase;
 use HCaptcha\Settings\General;
@@ -124,15 +125,22 @@ public function test_init_form_fields() {
 	 * @dataProvider dp_test_setup_fields
 	 */
 	public function test_setup_fields( $mode ) {
+		$settings = Mockery::mock( Settings::class )->makePartial();
+		$settings->shouldReceive( 'get_mode' )->andReturn( $mode );
+
+		$main = Mockery::mock( Main::class )->makePartial();
+		$main->shouldReceive( 'settings' )->andReturn( $settings );
+
 		$subject = Mockery::mock( General::class )->makePartial();
 		$subject->shouldAllowMockingProtectedMethods();
 		$subject->shouldReceive( 'is_options_screen' )->andReturn( true );
-		$subject->shouldReceive( 'get' )->andReturn( $mode );
 		$this->set_protected_property( $subject, 'form_fields', $this->get_test_form_fields() );
 
 		WP_Mock::passthruFunction( 'register_setting' );
 		WP_Mock::passthruFunction( 'add_settings_field' );
 
+		WP_Mock::userFunction( 'hcaptcha' )->with()->once()->andReturn( $main );
+
 		$subject->setup_fields();
 
 		$form_fields = $this->get_protected_property( $subject, 'form_fields' );
@@ -187,6 +195,18 @@ public function test_setup_fields_not_on_options_screen() {
 	public function test_section_callback( $section_id, $expected ) {
 		$subject = Mockery::mock( General::class )->makePartial()->shouldAllowMockingProtectedMethods();
 
+		$notifications = Mockery::mock( Notifications::class )->makePartial();
+
+		if ( General::SECTION_KEYS === $section_id ) {
+			$notifications->shouldReceive( 'show' )->once();
+			$main = Mockery::mock( Main::class )->makePartial();
+			$main->shouldReceive( 'notifications' )->andReturn( $notifications );
+
+			WP_Mock::userFunction( 'hcaptcha' )->with()->once()->andReturn( $main );
+		} else {
+			WP_Mock::userFunction( 'hcaptcha' )->never();
+		}
+
 		WP_Mock::passthruFunction( 'wp_kses_post' );
 
 		ob_start();
@@ -206,8 +226,6 @@ public function dp_test_section_callback() {
 				'				<h2>
 					General				</h2>
 				<div id="hcaptcha-message"></div>
-				<p>
-					To use <a href="https://www.hcaptcha.com/?r=wp&utm_source=wordpress&utm_medium=wpplugin&utm_campaign=sk" target="_blank">hCaptcha</a>, please register <a href="https://www.hcaptcha.com/signup-interstitial/?r=wp&utm_source=wordpress&utm_medium=wpplugin&utm_campaign=sk" target="_blank">here</a> to get your site and secret keys.				</p>
 						<h3 class="hcaptcha-section-keys">Keys</h3>
 		',
 			],
@@ -244,7 +262,7 @@ public function test_admin_enqueue_scripts() {
 		$site_key       = 'some key';
 
 		$settings = Mockery::mock( Settings::class )->makePartial();
-		$settings->shouldReceive( 'get_site_key' )->andReturn( $site_key );
+		$settings->shouldReceive( 'get' )->with( 'site_key' )->andReturn( $site_key );
 
 		$main = Mockery::mock( Main::class )->makePartial();
 		$main->shouldReceive( 'settings' )->andReturn( $settings );
@@ -297,7 +315,7 @@ static function ( $name ) use ( $plugin_url, $plugin_version ) {
 				General::OBJECT,
 				[
 					'ajaxUrl'                              => $ajax_url,
-					'action'                               => General::CHECK_CONFIG_ACTION,
+					'checkConfigAction'                    => General::CHECK_CONFIG_ACTION,
 					'nonce'                                => $nonce,
 					'modeLive'                             => General::MODE_LIVE,
 					'modeTestPublisher'                    => General::MODE_TEST_PUBLISHER,

diff --git a/.wordpress-org/icon-128x128.png b/.wordpress-org/icon-128x128.png
diff --git a/.wordpress-org/icon.svg b/.wordpress-org/icon.svg
diff --git a/assets/css/general.css b/assets/css/general.css
@@ -1,3 +1,9 @@
+#hcaptcha-message,
+#setting-error-settings_updated {
+	max-width: 760px;
+	box-sizing: border-box;
+}
+
 #hcaptcha-options table tbody {
 	background: #fff;
 }
@@ -20,11 +26,38 @@
 
 .hcaptcha-section-keys + table tbody {
 	display: grid;
-	grid-template-columns: repeat(2, 1fr);
+	grid-template-columns: repeat(4, 1fr);
+	grid-template-areas:
+		"site-key site-key secret-key secret-key"
+		"sample-hcaptcha sample-hcaptcha check-config reset-notifications";
 	gap: 10px 20px;
 	padding: 15px 20px;
 }
 
+.hcaptcha-section-keys + table tbody th {
+	width: auto;
+}
+
+.hcaptcha-section-keys + table tbody tr.hcaptcha-general-site-key {
+	grid-area: site-key;
+}
+
+.hcaptcha-section-keys + table tbody tr.hcaptcha-general-secret-key {
+	grid-area: secret-key;
+}
+
+.hcaptcha-section-keys + table tbody tr.hcaptcha-general-sample-hcaptcha {
+	grid-area: sample-hcaptcha;
+}
+
+.hcaptcha-section-keys + table tbody tr.hcaptcha-general-check-config {
+	grid-area: check-config;
+}
+
+.hcaptcha-section-keys + table tbody tr.hcaptcha-reset-notifications {
+	grid-area: reset-notifications;
+}
+
 .hcaptcha-section-keys + table tbody tr th {
 	padding: 0 0 10px 0;
 }
@@ -163,6 +196,14 @@
 		width: auto;
 	}
 
+	.hcaptcha-section-keys + table tbody {
+		grid-template-areas: unset;
+	}
+
+	.hcaptcha-section-keys + table tbody tr {
+		grid-area: unset !important;
+	}
+
 	.hcaptcha-section-other + table tbody {
 		grid-template-areas: unset;
 	}

diff --git a/assets/css/notifications.css b/assets/css/notifications.css
@@ -0,0 +1,95 @@
+#hcaptcha-notifications {
+	margin: 5px 0 15px;
+	background: #fff;
+	padding: 15px 20px;
+	max-width: 760px;
+	box-sizing: border-box;
+}
+
+#hcaptcha-notifications-header {
+	display: flex;
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #c3c4c7;
+	line-height: 1.3;
+	font-size: 14px;
+	font-weight: 600;
+	justify-content: flex-start;
+	align-items: center;
+	column-gap: 3px;
+}
+
+#hcaptcha-notifications-header::before {
+	content: '';
+	background-image: url('../images/notification-bell.svg');
+	background-size: cover;
+	position: relative;
+	width: 30px;
+	height: 30px;
+}
+
+#hcaptcha-notifications-footer {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 10px;
+	padding-top: 10px;
+	border-top: 1px solid #c3c4c7;
+}
+
+#hcaptcha-notifications .hcaptcha-notification {
+	margin: 0;
+}
+
+.hcaptcha-notification .hcaptcha-notification-title {
+	margin: 7px 0;
+	padding: 2px;
+	line-height: 1.3;
+	font-weight: 600;
+}
+
+.hcaptcha-notification {
+	display: none;
+}
+
+#hcaptcha-notifications-header + .hcaptcha-notification {
+	display: block;
+}
+
+#hcaptcha-navigation {
+	display: flex;
+	justify-content: flex-end;
+	column-gap: 3px;
+}
+
+#hcaptcha-navigation a {
+	width: 30px;
+	height: 30px;
+	border: 1px solid #2271b1;
+	border-radius: 3px;
+	background: #f6f7f7;
+	font-size: 16px;
+	line-height: 25px;
+	text-align: center;
+	cursor: pointer;
+	box-sizing: border-box;
+}
+
+#hcaptcha-navigation a.disabled {
+	color: #a7aaad;
+	border-color: #dcdcde;
+	background: #f6f7f7;
+	cursor: default;
+}
+
+#hcaptcha-navigation a.prev::after,
+#hcaptcha-navigation a.next::after {
+	font-size: 12px;
+}
+
+#hcaptcha-navigation a.prev::after {
+	content: '<'
+}
+
+#hcaptcha-navigation a.next::after {
+	content: '>';
+}