From f888576b6885f7d6098daf00ead73972c1f718ae Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Wed, 20 May 2026 17:15:33 -0400
Subject: [PATCH 1/3] Tests: Add unit tests for wp_ajax_widgets_order()

Co-authored-by: Junie <junie@jetbrains.com>
---
 .../includes/ajax-actions/widgetsOrder.php    | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php

diff --git a/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php b/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
new file mode 100644
index 0000000000000..c54759b078e73
--- /dev/null
+++ b/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Admin Ajax functions to be tested.
+ */
+require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
+
+/**
+ * Testing wp_ajax_widgets_order() functionality.
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 3.1.0
+ *
+ * @group ajax
+ *
+ * @covers ::wp_ajax_widgets_order
+ */
+class Tests_wp_ajax_widgets_order extends WP_Ajax_UnitTestCase {
+
+	/**
+	 * Administrator user ID.
+	 *
+	 * @var int
+	 */
+	protected static $admin_id;
+
+	/**
+	 * Setup test fixtures.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ): void {
+		self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+	}
+
+	/**
+	 * Tests successful widgets order saving.
+	 *
+	 * @ticket 65252
+	 */
+	public function test_widgets_order_success(): void {
+		wp_set_current_user( self::$admin_id );
+
+		// Mock sidebars.
+		$sidebars = array(
+			'sidebar-1' => 'widget-1_text-1,widget-2_text-2',
+			'sidebar-2' => 'widget-3_search-1',
+		);
+
+		$_POST = array(
+			'action'      => 'widgets-order',
+			'savewidgets' => wp_create_nonce( 'save-sidebar-widgets' ),
+			'sidebars'    => $sidebars,
+		);
+
+		try {
+			$this->_handleAjax( 'widgets-order' );
+		} catch ( WPAjaxDieContinueException $e ) {
+			// Expect success.
+		}
+
+		$this->assertSame( '1', $this->_last_response );
+
+		$updated_sidebars = wp_get_sidebars_widgets();
+		$this->assertContains( 'text-1', $updated_sidebars['sidebar-1'] );
+		$this->assertContains( 'text-2', $updated_sidebars['sidebar-1'] );
+		$this->assertContains( 'search-1', $updated_sidebars['sidebar-2'] );
+	}
+
+	/**
+	 * Tests failure due to invalid nonce.
+	 *
+	 * @ticket 65252
+	 */
+	public function test_widgets_order_invalid_nonce(): void {
+		wp_set_current_user( self::$admin_id );
+
+		$_POST = array(
+			'action'      => 'widgets-order',
+			'savewidgets' => 'invalid-nonce',
+		);
+
+		$this->expectException( WPAjaxDieStopException::class );
+		$this->expectExceptionMessage( '-1' );
+
+		$this->_handleAjax( 'widgets-order' );
+	}
+
+	/**
+	 * Tests failure due to insufficient permissions.
+	 *
+	 * @ticket 65252
+	 */
+	public function test_widgets_order_insufficient_permissions(): void {
+		$user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+		wp_set_current_user( $user_id );
+
+		$_POST = array(
+			'action'      => 'widgets-order',
+			'savewidgets' => wp_create_nonce( 'save-sidebar-widgets' ),
+		);
+
+		$this->expectException( WPAjaxDieStopException::class );
+		$this->expectExceptionMessage( '-1' );
+
+		$this->_handleAjax( 'widgets-order' );
+	}
+
+	/**
+	 * Tests behavior when sidebars parameter is missing.
+	 *
+	 * @ticket 65252
+	 */
+	public function test_widgets_order_missing_sidebars(): void {
+		wp_set_current_user( self::$admin_id );
+
+		$_POST = array(
+			'action'      => 'widgets-order',
+			'savewidgets' => wp_create_nonce( 'save-sidebar-widgets' ),
+		);
+
+		$this->expectException( WPAjaxDieStopException::class );
+		$this->expectExceptionMessage( '-1' );
+
+		$this->_handleAjax( 'widgets-order' );
+	}
+}

From 388b875bfa168c56f15441922960c970bb7c7cc3 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Mon, 25 May 2026 16:58:37 -0400
Subject: [PATCH 2/3] Tests: Update wp_ajax_widgets_order() test to use
 exception assertions

---
 .../tests/admin/includes/ajax-actions/widgetsOrder.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php b/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
index c54759b078e73..404251c534d4e 100644
--- a/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
+++ b/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
@@ -54,11 +54,11 @@ public function test_widgets_order_success(): void {
 			'sidebars'    => $sidebars,
 		);
 
-		try {
-			$this->_handleAjax( 'widgets-order' );
-		} catch ( WPAjaxDieContinueException $e ) {
-			// Expect success.
-		}
+
+		$this->expectException( WPAjaxDieStopException::class );
+		$this->expectExceptionMessage( '1' );
+
+		$this->_handleAjax( 'widgets-order' );
 
 		$this->assertSame( '1', $this->_last_response );
 

From 60ed8d44d2eab26022a2e5c35dc6de20d5285875 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Mon, 25 May 2026 17:02:43 -0400
Subject: [PATCH 3/3] Remove empty line before exception handling

---
 tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php b/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
index 404251c534d4e..cd9db2ee873b7 100644
--- a/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
+++ b/tests/phpunit/tests/admin/includes/ajax-actions/widgetsOrder.php
@@ -54,7 +54,6 @@ public function test_widgets_order_success(): void {
 			'sidebars'    => $sidebars,
 		);
 
-
 		$this->expectException( WPAjaxDieStopException::class );
 		$this->expectExceptionMessage( '1' );