From 74f6e48fad918ae62092c4ae66e3d0cbf282a34e Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@gmail.com>
Date: Tue, 3 Dec 2024 10:59:27 -0700
Subject: [PATCH] Add E2E tests for testing the output of
 wp_get_attachment_image and get_image_tag

---
 safe-svg.php                                  |  3 +-
 tests/cypress/e2e/safe-svg.cy.js              | 37 +++++++++++++++++++
 tests/cypress/test-plugin/e2e-test-plugin.php | 16 ++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/safe-svg.php b/safe-svg.php
index 256c7fc5..326399ae 100644
--- a/safe-svg.php
+++ b/safe-svg.php
@@ -504,8 +504,7 @@ public function get_image_tag_override( $html, $id, $alt, $title, $align, $size
 				if ( is_array( $size ) ) {
 					$width  = $size[0];
 					$height = $size[1];
-				// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found, Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
-				} elseif ( 'full' === $size && $dimensions = $this->svg_dimensions( $id ) ) {
+				} elseif ( 'full' === $size && $dimensions = $this->svg_dimensions( $id ) ) { // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found, Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
 					$width  = $dimensions['width'];
 					$height = $dimensions['height'];
 				} else {
diff --git a/tests/cypress/e2e/safe-svg.cy.js b/tests/cypress/e2e/safe-svg.cy.js
index 00e7cb7d..9038d185 100644
--- a/tests/cypress/e2e/safe-svg.cy.js
+++ b/tests/cypress/e2e/safe-svg.cy.js
@@ -105,4 +105,41 @@ describe('Safe SVG Tests', () => {
     cy.activatePlugin('safe-svg-cypress-optimizer-test-plugin');
     cy.createPost('Hello World');
   });
+
+  it('Output of wp_get_attachment_image should use full svg dimensions', () => {
+    // Activate test plugin.
+    cy.activatePlugin('safe-svg-cypress-test-plugin');
+
+	// Visit the home page.
+    cy.visit('/');
+
+	// Verify that the SVG images are displayed with the correct dimensions.
+	cy.get('#thumbnail-image').should('have.attr', 'width', '256').should('have.attr', 'height', '256');
+	cy.get('#medium-image').should('have.attr', 'width', '256').should('have.attr', 'height', '256');
+	cy.get('#large-image').should('have.attr', 'width', '256').should('have.attr', 'height', '256');
+	cy.get('#full-image').should('have.attr', 'width', '256').should('have.attr', 'height', '256');
+	cy.get('#custom-image').should('have.attr', 'width', '256').should('have.attr', 'height', '256');
+
+	// Deactivate the test plugin.
+	cy.deactivatePlugin('safe-svg-cypress-test-plugin');
+  });
+
+  it('Output of get_image_tag should use custom dimensions', () => {
+    // Activate test plugin.
+    cy.activatePlugin('safe-svg-cypress-test-plugin');
+
+	// Visit the home page.
+    cy.visit('/');
+
+	// Verify that the SVG images are displayed with the correct dimensions.
+	// TODO: these are the sizes returned but seems they are not correct. get_image_tag_override needs to be fixed.
+	cy.get('.size-thumbnail.wp-image-6').should('have.attr', 'width', '150').should('have.attr', 'height', '150');
+	cy.get('.size-medium.wp-image-6').should('have.attr', 'width', '300').should('have.attr', 'height', '300');
+	cy.get('.size-large.wp-image-6').should('have.attr', 'width', '1024').should('have.attr', 'height', '1024');
+	cy.get('.size-full.wp-image-6').should('have.attr', 'width', '256').should('have.attr', 'height', '256');
+	cy.get('.size-100x120.wp-image-6').should('have.attr', 'width', '100').should('have.attr', 'height', '100');
+
+	// Deactivate the test plugin.
+	cy.deactivatePlugin('safe-svg-cypress-test-plugin');
+  });
 });
diff --git a/tests/cypress/test-plugin/e2e-test-plugin.php b/tests/cypress/test-plugin/e2e-test-plugin.php
index b01810b3..0689e06a 100644
--- a/tests/cypress/test-plugin/e2e-test-plugin.php
+++ b/tests/cypress/test-plugin/e2e-test-plugin.php
@@ -21,3 +21,19 @@ function ( $tags ) {
 		return $tags;
 	}
 );
+
+add_action(
+	'wp_body_open',
+	function () {
+		echo wp_get_attachment_image( 6, 'thumbnail', false, [ 'id' => 'thumbnail-image' ] );
+		echo wp_get_attachment_image( 6, 'medium', false, [ 'id' => 'medium-image' ] );
+		echo wp_get_attachment_image( 6, 'large', false, [ 'id' => 'large-image' ] );
+		echo wp_get_attachment_image( 6, 'full', false, [ 'id' => 'full-image' ] );
+		echo wp_get_attachment_image( 6, [ 100, 120 ], false, [ 'id' => 'custom-image' ] );
+		echo get_image_tag( 6, '', '', '', 'thumbnail' );
+		echo get_image_tag( 6, '', '', '', 'medium' );
+		echo get_image_tag( 6, '', '', '', 'large' );
+		echo get_image_tag( 6, '', '', '', 'full' );
+		echo get_image_tag( 6, '', '', '', [ 100, 120 ] );
+	}
+);