From 17fec690b0d2a0c68f215f10bfbd7486f13f90a6 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinkle@fastmail.com>
Date: Tue, 3 May 2022 01:07:28 +0200
Subject: [PATCH] tests: Remove use of QUnit 1.x setup()/teardown()

No longer supported upstream. Was kept compatible via MW core
testrunner.js, which I'd like to phase out so that our custom wrapper
can be removed, and thus other features like `QUnit.module.skip()`
become available.

While at it, also convert the file from an ad-hoc closure to using
the QUnit.module() scope and hooks object, as per
<https://api.qunitjs.com/QUnit/module/>.

Bug: T250045
Change-Id: I8c04c56cf5eec3f19ef12a803a192cd824b82f81
---
 tests/qunit/ext.wikiEditor.toolbar.test.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/qunit/ext.wikiEditor.toolbar.test.js b/tests/qunit/ext.wikiEditor.toolbar.test.js
index 1e834a7f..692ea78b 100644
--- a/tests/qunit/ext.wikiEditor.toolbar.test.js
+++ b/tests/qunit/ext.wikiEditor.toolbar.test.js
@@ -1,14 +1,12 @@
-( function () {
-	QUnit.module( 'ext.wikiEditor.toolbar', QUnit.newMwEnvironment( {
-		setup: function () {
-			var $target = $( '<textarea>' )
-				.attr( 'id', 'wpTextBox1' )
-				.appendTo( '#qunit-fixture' );
-			this.$target = $target;
-			$target.wikiEditor( 'addModule', 'toolbar' );
-			this.$ui = $target.data( 'wikiEditor-context' ).$ui;
-		}
-	} ) );
+QUnit.module( 'ext.wikiEditor.toolbar', function ( hooks ) {
+	hooks.beforeEach( function () {
+		var $target = $( '<textarea>' )
+			.attr( 'id', 'wpTextBox1' )
+			.appendTo( '#qunit-fixture' );
+		this.$target = $target;
+		$target.wikiEditor( 'addModule', 'toolbar' );
+		this.$ui = $target.data( 'wikiEditor-context' ).$ui;
+	} );
 
 	QUnit.test( 'Toolbars', function ( assert ) {
 		// Add toolbar section
@@ -284,4 +282,4 @@
 		assert.strictEqual( this.$ui.find( '*[rel="info"].section' ).length, 0, 'After removing booklet section' );
 	} );
 
-}() );
+} );