fix tests and add new ones

Author: selul

inc/dam.php

@@ -626,6 +626,7 @@ public function alter_attachment_for_js( $response, $attachment, $meta ) {
 		}
 
 		$sizes = Optml_App_Replacer::image_sizes();
+
 		$meta = [];
 		if ( isset( $response['width'] ) ) {
 			$meta['width'] = $response['width'];
@@ -638,6 +639,7 @@ public function alter_attachment_for_js( $response, $attachment, $meta ) {
 				continue;
 			}
 			$args = $this->size_to_dimension( $size, $meta );
+
 			$response['sizes'][ $size ] = array_merge(
 				$args,
 				[
@@ -710,7 +712,7 @@ public function alter_img_tag_w_h( $dimensions, $image_src, $image_meta, $attach
 	 * @return string
 	 */
 	public function replace_dam_url_args( $args, $subject ) {
-		$args = wp_parse_args( $args, [ 'width' => 'auto', 'height' => 'auto', 'crop' => false, 'dam' => true ] );
+		$args = wp_parse_args( $args, [ 'width' => 'auto', 'height' => 'auto', 'dam' => true ] );
 
 		$width = $args['width'];
 		$height = $args['height'];
@@ -736,6 +738,7 @@ public function replace_dam_url_args( $args, $subject ) {
 		if ( $crop === true ) {
 			$replacement .= '/g:' . $gravity . '/rt:fill';
 		} elseif ( is_array( $crop ) && ! empty( $crop ) ) {
+
 			$replacement .= '/' . ( new GravityProperty( $crop['gravity'] ) ) .
 							'/' . new ResizeTypeProperty( $crop['type'] ) .
 							( $crop['enlarge'] ? '/el:1' : '' );

tests/test-dam.php

@@ -62,6 +62,11 @@ class Test_Dam extends WP_UnitTestCase {
 			'orientation' => 'landscape',
 			'crop'        => true
 		],
+		'test_gravity' => [
+			'width'       => 200,
+			'height'      => 100,
+			'crop'        => ['left','top']
+		],
 		'test_portrait'  => [
 			'width'       => 100,
 			'height'      => 200,
@@ -232,27 +237,28 @@ public function test_alter_attachment_image_src() {
 			$this->assertStringContainsString( 'w:200/h:100/g:ce/rt:fill', $result[0] );
 			$this->assertEquals( 200, $result[1] );
 			$this->assertEquals( 100, $result[2] );
-			$this->assertTrue( $result[3] );
+			$this->assertFalse( $result[3] );
+			$result = $this->dam->alter_attachment_image_src( false, $id, 'test_gravity', false );
+			$this->assertStringContainsString( 'w:200/h:100/g:noea/rt:fill', $result[0] );
 
 			$result = $this->dam->alter_attachment_image_src( false, $id, 'test_portrait', false );
 			$this->assertStringContainsString( 'w:100/h:200/g:ce/rt:fill', $result[0] );
 			$this->assertEquals( 100, $result[1] );
 			$this->assertEquals( 200, $result[2] );
-			$this->assertTrue( $result[3] );
+			$this->assertFalse( $result[3] );
 
 			$result = $this->dam->alter_attachment_image_src( false, $id, 'medium', false );
-			$this->assertStringContainsString( 'w:300/h:300/', $result[0] );
+			$this->assertStringContainsString( 'w:200/h:300/', $result[0] );
 			$this->assertStringNotContainsString( 'g:ce/rt:fill', $result[0] );
-			$this->assertEquals( 300, $result[1] );
+			$this->assertEquals( 200, $result[1] );
 			$this->assertEquals( 300, $result[2] );
 			$this->assertFalse( $result[3] );
 
 			$result = $this->dam->alter_attachment_image_src( false, $id, [ 50, 20 ], false );
-			$this->assertStringContainsString( 'w:50/h:20/g:ce/rt:fill', $result[0] );
-			$this->assertEquals( 50, $result[1] );
+			$this->assertStringContainsString( 'w:13/h:20/', $result[0] );
+			$this->assertEquals( 13, $result[1] );
 			$this->assertEquals( 20, $result[2] );
-			$this->assertEquals( true, $result[3] );
-			$this->assertTrue( $result[3] );
+			$this->assertFalse( $result[3] );
 		}
 	}