Skip to content

Commit cdf0f33

Browse files
committed
Cover min with tests too
1 parent 079ac72 commit cdf0f33

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tests/wpunit/AssetsTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,7 @@ protected function assert_minified_found( $slug_prefix, $is_js = true, $has_min
10221022

10231023
$url = plugins_url( ( $group_path_path ? $group_path_path : '/assets/tests/_data/' ) . ( $should_prefix ? ( $is_js ? 'js/' : 'css/' ) : '' ) . $slug_prefix );
10241024

1025-
$path = wp_normalize_path( WP_PLUGIN_DIR . ( $group_path_path ? $group_path_path : '/assets/tests/_data/' ) . ( $should_prefix ? ( $is_js ? 'js/' : 'css/' ) : '' ) . $slug_prefix . ( $is_js ? '.js' : '.css' ) );
1026-
1025+
$path = wp_normalize_path( WP_PLUGIN_DIR . ( $group_path_path ? $group_path_path : '/assets/tests/_data/' ) . ( $should_prefix ? ( $is_js ? 'js/' : 'css/' ) : '' ) . $slug_prefix );
10271026
$urls = [];
10281027

10291028
$this->set_const_value( 'SCRIPT_DEBUG', false );
@@ -1033,12 +1032,17 @@ protected function assert_minified_found( $slug_prefix, $is_js = true, $has_min
10331032
if ( $has_only_min ) {
10341033
$urls[] = $url . '.min' . ( $is_js ? '.js' : '.css' );
10351034
$urls[] = $url . '.min' . ( $is_js ? '.js' : '.css' );
1035+
$temp_path = $path . '.min' . ( $is_js ? '.js' : '.css' );
1036+
$path = file_exists( $temp_path ) ? $temp_path : $path . ( $is_js ? '.js' : '.css' );
10361037
} elseif ( $has_min ) {
10371038
$urls[] = $url . ( $is_js ? '.min.js' : '.min.css' );
10381039
$urls[] = $url . ( $is_js ? '.js' : '.css' );
1040+
$temp_path = $path . '.min' . ( $is_js ? '.js' : '.css' );
1041+
$path = file_exists( $temp_path ) ? $temp_path : $path . ( $is_js ? '.js' : '.css' );
10391042
} else {
10401043
$urls[] = $url . ( $is_js ? '.js' : '.css' );
10411044
$urls[] = $url . ( $is_js ? '.js' : '.css' );
1045+
$path .= $is_js ? '.js' : '.css';
10421046
}
10431047

10441048
$plugins_path = str_replace( constant( 'WP_CONTENT_DIR' ), '', constant( 'WP_PLUGIN_DIR' ) );
@@ -1079,7 +1083,7 @@ static function ( $url ) {
10791083
$id
10801084
);
10811085

1082-
$this->assertEquals( $path, $asset->get_full_resource_path( false ) );
1086+
$this->assertEquals( $path, $asset->get_full_resource_path() );
10831087
}
10841088

10851089
/**

0 commit comments

Comments
 (0)