Imminent Deprecation

Author: RickiJay-WMDE

test/specs/fedprops/fedprops-item.ts

@@ -39,9 +39,9 @@ describe( 'Fed props Item', function () {
 
 		await ItemPage.open( itemId );
 
-		await expect(
-			$( '.wikibase-statementgroupview-property' )
-		).toHaveTextContaining( propertyValue ); // value is the label
+		await expect( $( '.wikibase-statementgroupview-property' ) ).toHaveText(
+			/propertyValue/
+		); // value is the label
 
 		await SpecialEntityPage.addStatementLink;
 	} );

test/specs/quickstatements/quickstatements-service.ts

@@ -88,7 +88,7 @@ describe( 'QuickStatements Service', function () {
 		await browser.pause( 2 * 1000 );
 
 		// redirect back to app
-		await expect( $( 'nav.navbar' ) ).toHaveTextContaining( 'QuickStatements' );
+		await expect( $( 'nav.navbar' ) ).toHaveText( /QuickStatements/ );
 	} );
 
 	it( 'Should be able to click batch button and be taken to the next page', async function () {

test/specs/repo/extensions/wikibase-local-media.ts

@@ -36,7 +36,8 @@ describe( 'WikibaseLocalMedia', function () {
 		await PropertyPage.open( propertyId );
 
 		propertyLabel = await $( '#firstHeading' ).getText();
-		await expect( $( '#firstHeading' ) ).toHaveTextContaining( propertyId );
+		// eslint-disable-next-line security/detect-non-literal-regexp
+		await expect( $( '#firstHeading' ) ).toHaveText( new RegExp( propertyId ) );
 	} );
 
 	it( 'Should allow to use uploaded image on statement', async function () {

test/specs/repo/property.ts

@@ -111,9 +111,9 @@ describe( 'Property', function () {
 					$( 'ul.mw-contributions-list' ).$$( 'li' )
 				).resolves.toHaveLength( 4 );
 				await expect( $( 'span.mw-tag-marker-mw-undo' ) ).toExist();
-				await expect(
-					$( 'ul.mw-contributions-list' ).$( 'li.before' )
-				).toHaveTextContaining( undoSummaryText );
+				await expect( $( 'ul.mw-contributions-list' ).$( 'li.before' ) ).toHaveText(
+					new RegExp( undoSummaryText )
+				);
 			} );
 
 			it( 'Should be able to set label, description, aliases', async function () {

test/specs/repo/special-recent-changes.ts

@@ -8,35 +8,35 @@ describe( 'Special:RecentChanges', function () {
 	it( 'Should be able to change limit', async function () {
 		await expect(
 			$( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' )
-		).toHaveTextContaining( '50 changes' );
+		).toHaveText( /50 changes/ );
 		await $( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' ).click();
 		await $( 'div.mw-rcfilters-ui-changesLimitPopupWidget' )
 			.$( 'span=100' )
 			.click();
 		await expect(
 			$( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' )
-		).toHaveTextContaining( '100 changes' );
+		).toHaveText( /100 changes/ );
 	} );
 
 	it( 'Should be able to change time to 2 hours', async function () {
 		await expect(
 			$( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' )
-		).toHaveTextContaining( '7 days' );
+		).toHaveText( /7 days/ );
 		await $( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' ).click();
 		await $( 'div.mw-rcfilters-ui-datePopupWidget-hours' ).$( 'span=2' ).click();
 		await expect(
 			$( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' )
-		).toHaveTextContaining( '2 hours' );
+		).toHaveText( /2 hours/ );
 	} );
 
 	it( 'Should be able to change time to 3 days', async function () {
 		await expect(
 			$( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' )
-		).toHaveTextContaining( '7 days' );
+		).toHaveText( /7 days/ );
 		await $( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' ).click();
 		await $( 'div.mw-rcfilters-ui-datePopupWidget-days' ).$( 'span=3' ).click();
 		await expect(
 			$( 'div.mw-rcfilters-ui-changesLimitAndDateButtonWidget' )
-		).toHaveTextContaining( '3 days' );
+		).toHaveText( /3 days/ );
 	} );
 } );

test/specs/repo/special-version.ts

@@ -1,8 +1,9 @@
 describe( 'Special:Version', function () {
 	it( 'Should contain the correct MediaWiki version', async function () {
 		await browser.url( `${ testEnv.vars.WIKIBASE_URL }/wiki/Special:Version` );
-		await expect( $( '#sv-software' ) ).toHaveTextContaining(
-			`MediaWiki ${ testEnv.vars.MEDIAWIKI_VERSION }`
+		await expect( $( '#sv-software' ) ).toHaveText(
+			// eslint-disable-next-line security/detect-non-literal-regexp
+			new RegExp( `MediaWiki ${ testEnv.vars.MEDIAWIKI_VERSION }` )
 		);
 	} );
 

test/specs/repo_client/item.ts

@@ -80,12 +80,12 @@ describe( 'Item', function () {
 		await $( '#wb-setsitelink-submit button' ).click();
 
 		// label should come from repo property
-		await expect(
-			$( '.wikibase-sitelinklistview-listview li' )
-		).toHaveTextContaining( 'client_wiki' );
-		await expect(
-			$( '.wikibase-sitelinklistview-listview li' )
-		).toHaveTextContaining( pageTitle );
+		await expect( $( '.wikibase-sitelinklistview-listview li' ) ).toHaveText(
+			/client_wiki/
+		);
+		await expect( $( '.wikibase-sitelinklistview-listview li' ) ).toHaveText(
+			new RegExp( pageTitle )
+		);
 	} );
 
 	it( 'Should be able to see site-link change is dispatched to client', async function () {