Add ElasticPress and install during our tests that need it. Fix unit …

…tests
10up · Sep 12, 2024 · 28c5326 · 28c5326
1 parent 1fe1bec
commit 28c5326
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 5 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-  "plugins": [".", "./tests/test-plugin", "https://downloads.wordpress.org/plugin/classic-editor.zip"],
+  "plugins": [".", "./tests/test-plugin", "https://downloads.wordpress.org/plugin/classic-editor.zip", "https://downloads.wordpress.org/plugin/elasticpress.zip"],
   "env": {
     "tests": {
       "mappings": {

diff --git a/includes/Classifai/Helpers.php b/includes/Classifai/Helpers.php
@@ -667,7 +667,7 @@ function get_classification_mode(): string {
 /**
  * Get all parts from the current URL.
  *
- * For instance, if the URL is `https://example.com/this/is/a/test`,
+ * For instance, if the URL is `https://example.com/this/is/a/test/`,
  * this function will return: `[ 'this', 'is', 'a', 'test' ]`.
  *
  * @return array
@@ -677,7 +677,7 @@ function get_url_slugs(): array {
 
 	$parts = explode( '/', $wp->request );
 
-	return $parts;
+	return array_filter( $parts );
 }
 
 /**
@@ -691,7 +691,7 @@ function get_url_slugs(): array {
 function get_last_url_slug(): string {
 	$parts = get_url_slugs();
 
-	return end( $parts );
+	return trim( end( $parts ) );
 }
 
 /**

diff --git a/tests/Classifai/HelpersTest.php b/tests/Classifai/HelpersTest.php
@@ -293,7 +293,9 @@ public function test_get_post_statuses() {
 	public function test_get_url_slugs() {
 		global $wp;
 
-		$wp->request = 'https://example.com/this/is/a/test/';
+		// If URL is https://www.example.com/this/is/a/test/
+		// $wp->request will be 'this/is/a/test'.
+		$wp->request = 'this/is/a/test';
 
 		$slugs = get_url_slugs();
 		$this->assertEquals( [ 'this', 'is', 'a', 'test' ], $slugs );

diff --git a/tests/cypress/integration/language-processing/smart-404-azure-openai.test.js b/tests/cypress/integration/language-processing/smart-404-azure-openai.test.js
@@ -8,7 +8,19 @@ describe( '[Language processing] Smart 404 - Azure OpenAI Tests', () => {
 		cy.login();
 	} );
 
+	it( "See error message if ElasticPress isn't activate", () => {
+		cy.disableElasticPress();
+
+		cy.visit(
+			'/wp-admin/tools.php?page=classifai&tab=language_processing&feature=feature_smart_404'
+		);
+
+		cy.get( '.classifai-nlu-sections .notice-error' ).should( 'exist' );
+	} );
+
 	it( 'Can save Smart 404 settings', () => {
+		cy.enableElasticPress();
+
 		cy.visit(
 			'/wp-admin/tools.php?page=classifai&tab=language_processing&feature=feature_smart_404'
 		);
@@ -45,5 +57,7 @@ describe( '[Language processing] Smart 404 - Azure OpenAI Tests', () => {
 
 		// Save settings.
 		cy.get( '#submit' ).click();
+
+		cy.disableElasticPress();
 	} );
 } );
diff --git a/tests/cypress/integration/language-processing/smart-404-openai.test.js b/tests/cypress/integration/language-processing/smart-404-openai.test.js
@@ -8,7 +8,19 @@ describe( '[Language processing] Smart 404 - OpenAI Tests', () => {
 		cy.login();
 	} );
 
+	it( "See error message if ElasticPress isn't activate", () => {
+		cy.disableElasticPress();
+
+		cy.visit(
+			'/wp-admin/tools.php?page=classifai&tab=language_processing&feature=feature_smart_404'
+		);
+
+		cy.get( '.classifai-nlu-sections .notice-error' ).should( 'exist' );
+	} );
+
 	it( 'Can save Smart 404 settings', () => {
+		cy.enableElasticPress();
+
 		cy.visit(
 			'/wp-admin/tools.php?page=classifai&tab=language_processing&feature=feature_smart_404'
 		);
@@ -31,5 +43,7 @@ describe( '[Language processing] Smart 404 - OpenAI Tests', () => {
 
 		// Save settings.
 		cy.get( '#submit' ).click();
+
+		cy.disableElasticPress();
 	} );
 } );
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
@@ -574,3 +574,27 @@ Cypress.Commands.add( 'enableClassicEditor', () => {
 		}
 	} );
 } );
+
+/**
+ * Activate the ElasticPress plugin.
+ */
+Cypress.Commands.add( 'enableElasticPress', () => {
+	cy.visit( '/wp-admin/plugins.php' );
+	cy.get( 'body' ).then( ( $body ) => {
+		if ( $body.find( '#activate-elasticpress' ).length > 0 ) {
+			cy.get( '#activate-elasticpress' ).click();
+		}
+	} );
+} );
+
+/**
+ * Deactivate the Classic Editor plugin.
+ */
+Cypress.Commands.add( 'disableElasticPress', () => {
+	cy.visit( '/wp-admin/plugins.php' );
+	cy.get( 'body' ).then( ( $body ) => {
+		if ( $body.find( '#deactivate-elasticpress' ).length > 0 ) {
+			cy.get( '#deactivate-elasticpress' ).click();
+		}
+	} );
+} );