Merge "Rewrite input tests to more generic selectors"

wikimedia · Sep 26, 2024 · ead4cb9 · ead4cb9
2 parents c745c94 + d186299
commit ead4cb9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/cypress/e2e/component-interaction.cy.js b/cypress/e2e/component-interaction.cy.js
@@ -75,7 +75,7 @@ describe( 'Component interaction test', () => {
 		cy.wait( '@hasPetRequest' );
 		cy.get( '.query-condition__property-lookup .wikit-OptionsMenu__item' ).click();
 
-		cy.get( '.query-condition__value-input .wikit-Input' )
+		cy.get( '.query-condition__value-input input' )
 			.type( 'house cat' );
 		cy.wait( '@houseCatRequest' );
 		cy.get( '.query-condition__value-input .wikit-OptionsMenu__item' )
@@ -84,7 +84,7 @@ describe( 'Component interaction test', () => {
 
 		// clear out values from specified input components
 		cy.get( '.query-condition__property-lookup .wikit-Input' ).clear();
-		cy.get( '.query-condition__value-input .wikit-Input' ).clear();
+		cy.get( '.query-condition__value-input input' ).clear();
 
 		// set value to 'not matching' from dropdown. NotMatching => 'without',
 		cy.get( '.querybuilder-dropdown .cdx-select-vue' ).first().click();
@@ -96,7 +96,7 @@ describe( 'Component interaction test', () => {
 
 		cy.get( '.query-condition__property-lookup .wikit-OptionsMenu__item' ).first().click();
 
-		cy.get( '.query-condition__value-input .wikit-Input' )
+		cy.get( '.query-condition__value-input input' )
 			.type( 'house cat' );
 		cy.wait( '@houseCatRequest' );
 
@@ -140,7 +140,7 @@ describe( 'Component interaction test', () => {
 		cy.get( '.query-condition__property-lookup:nth(1) .wikit-OptionsMenu__item' ).click();
 
 		// Assert input value component is disabled when user selects 'regardless of value'
-		cy.get( '.query-condition__value-input:nth(1) .wikit-Input' ).should( 'be.disabled' );
+		cy.get( '.query-condition__value-input:nth(1) input' ).should( 'be.disabled' );
 
 		// click 'Add condition' button and expand to a second block
 		cy.get( '.querybuilder__add-condition button' ).click();

diff --git a/cypress/e2e/error-handling.cy.js b/cypress/e2e/error-handling.cy.js
@@ -1,6 +1,12 @@
 // for some reason Cypress keeps quotes around env vars coming from docker through `.env`
 const API_URL = Cypress.env( 'API_URL' ).replace( /(^')|('$)/g, '' );
 
+// TODO: Rewrite these tests to use messages instead of class name selectors
+
+// Ignore no-missing-require, as this is properly loads during tests
+// eslint-disable-next-line n/no-missing-require
+const messages = require( 'public/i18n/en.json' );
+
 function wikibaseApiRequest( query ) {
 	return {
 		url: API_URL + '*',
@@ -44,7 +50,7 @@ describe( 'Test error handling of the Query Builder', () => {
 		cy.get( '.wikit.wikit-ValidationMessage.wikit-ValidationMessage--error' ).should( 'be.visible' );
 
 		// Add some value to the value input component
-		cy.get( '.query-condition__value-input .wikit-Input' )
+		cy.get( '.query-condition__value-input input' )
 			.type( 'house cat' );
 		cy.wait( '@houseCatRequest' );
 
@@ -63,8 +69,14 @@ describe( 'Test error handling of the Query Builder', () => {
 		cy.get( '.query-condition:nth(0) .wikit.wikit-ValidationMessage' )
 			.should( 'not.exist' );
 
-		cy.get( '.query-condition:nth(1) .wikit.wikit-ValidationMessage' )
-			.should( 'have.length', 2 )
+		cy.get( '.query-condition:nth(1)' )
+			.contains( messages[ 'query-builder-result-error-missing-property' ] )
+			.should( 'have.length', 1 )
+			.should( 'be.visible' );
+
+		cy.get( '.query-condition:nth(1)' )
+			.contains( messages[ 'query-builder-result-error-missing-value' ] )
+			.should( 'have.length', 1 )
 			.should( 'be.visible' );
 
 		// Delete the second query condition

diff --git a/cypress/e2e/restore-from-url.cy.js b/cypress/e2e/restore-from-url.cy.js
@@ -56,7 +56,7 @@ describe( 'restore state from URL', () => {
 			.then( ( element ) => {
 				expect( element[ 0 ].value ).to.equal( 'instance of' );
 			} );
-		cy.get( '.query-condition__value-input .wikit-Input' )
+		cy.get( '.query-condition__value-input input' )
 			.then( ( element ) => {
 				expect( element[ 0 ].value ).to.equal( 'house cat' );
 			} );