From 3276f0eeddd68379b019ce9bfe9b5d735227c609 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Tue, 24 Apr 2018 12:08:45 +0100
Subject: [PATCH] Use OOUI form for 'clear' and 'raw edit' of watchlist

Change-Id: I2c53f66bc36b33d42d453b79056822b30796ea4e
---
 includes/specials/SpecialEditWatchlist.php                   | 4 ++--
 tests/phpunit/includes/specials/SpecialEditWatchlistTest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index f702bc0bcc..5e04d8d35c 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -667,7 +667,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		];
 		$context = new DerivativeContext( $this->getContext() );
 		$context->setTitle( $this->getPageTitle( 'raw' ) ); // Reset subpage
-		$form = new HTMLForm( $fields, $context );
+		$form = new OOUIHTMLForm( $fields, $context );
 		$form->setSubmitTextMsg( 'watchlistedit-raw-submit' );
 		# Used message keys: 'accesskey-watchlistedit-raw-submit', 'tooltip-watchlistedit-raw-submit'
 		$form->setSubmitTooltip( 'watchlistedit-raw-submit' );
@@ -686,7 +686,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	protected function getClearForm() {
 		$context = new DerivativeContext( $this->getContext() );
 		$context->setTitle( $this->getPageTitle( 'clear' ) ); // Reset subpage
-		$form = new HTMLForm( [], $context );
+		$form = new OOUIHTMLForm( [], $context );
 		$form->setSubmitTextMsg( 'watchlistedit-clear-submit' );
 		# Used message keys: 'accesskey-watchlistedit-clear-submit', 'tooltip-watchlistedit-clear-submit'
 		$form->setSubmitTooltip( 'watchlistedit-clear-submit' );
diff --git a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
index 05a63dbc49..69fa0dd4bb 100644
--- a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
+++ b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
@@ -33,7 +33,7 @@ class SpecialEditWatchlistTest extends SpecialPageTestBase {
 		$user = new TestUser( __METHOD__ );
 		list( $html, ) = $this->executeSpecialPage( 'clear', null, 'qqx', $user->getUser() );
 		$this->assertRegExp(
-			'/<form class="mw-htmlform" action=".*?Special:EditWatchlist\/clear" method="post">/',
+			'/<form action=\'.*?Special:EditWatchlist\/clear\'/',
 			$html
 		);
 	}
@@ -42,7 +42,7 @@ class SpecialEditWatchlistTest extends SpecialPageTestBase {
 		$user = new TestUser( __METHOD__ );
 		list( $html, ) = $this->executeSpecialPage( 'raw', null, 'qqx', $user->getUser() );
 		$this->assertContains(
-			'<textarea id="mw-input-wpTitles"',
+			'<div id=\'mw-input-wpTitles\'',
 			$html
 		);
 	}
-- 
2.20.1