Merge pull request #1229 from timber/1227_image_test_fix

jarednova · web-flow · commit 3a1deee7afc8 · 2016-11-04T07:59:28.000-04:00
1227 image test fix
diff --git a/lib/ImageHelper.php b/lib/ImageHelper.php
@@ -355,7 +355,7 @@ private static function analyze_url( $url ) {
 		$upload_dir = wp_upload_dir();
 		$tmp = $url;
 		if ( 0 === strpos($tmp, ABSPATH) ) {
-// we've been given a dir, not an url
+		// we've been given a dir, not an url
 			$result['absolute'] = true;
 			if ( 0 === strpos($tmp, $upload_dir['basedir']) ) {
 				$result['base'] = self::BASE_UPLOADS; // upload based
@@ -367,7 +367,7 @@ private static function analyze_url( $url ) {
 			}
 		} else {
 			if ( !$result['absolute'] ) {
-				$tmp = get_home_url().$tmp;
+				$tmp = site_url().$tmp;
 			}
 			if ( 0 === strpos($tmp, $upload_dir['baseurl']) ) {
 				$result['base'] = self::BASE_UPLOADS; // upload based
diff --git a/tests/test-timber-image-resize.php b/tests/test-timber-image-resize.php
@@ -113,33 +113,47 @@ function testCropHeight() {
 		$this->assertTrue( $is_sized );
 	}
 
-	function testWPMLurls() {
+	function testWPMLurlRemote() {
 		// this test replicates the url issue caused by the WPML language identifier in the url
 		// However, WPML can't be installed with composer so this test mocks the WPML plugin
 
 		// WPML uses a filter to alter the home_url
 		$home_url_filter = function( $url ) { return $url.'/en'; };
 		add_filter( 'home_url', $home_url_filter, -10, 4 );
 
+		$img = 'https://raw.githubusercontent.com/timber/timber/master/tests/assets/arch-2night.jpg';
 		// test with a local and external file
-		foreach ( array(
-					'arch.jpg',
-					'https://raw.githubusercontent.com/timber/timber/master/tests/assets/arch-2night.jpg'
-				) as $img ) {
-
-			// copy image if it's local
-			if ( strpos($img, '://') === false ) {
-				$img = TestTimberImage::copyTestImage($img);
-			}
-
-			$resized = TimberImageHelper::resize($img, 50, 50);
-
-			// make sure the base url has not been duplicated (https://github.com/timber/timber/issues/405)
-			$this->assertLessThanOrEqual( 1, substr_count($resized, 'example.org') );
-			// make sure the image has been resized
-			$resized = TimberUrlHelper::url_to_file_system( $resized );
-			$this->assertTrue( TestTimberImage::checkSize($resized, 50, 50), 'image should be resized' );
-		}
+		
+		$resized = TimberImageHelper::resize($img, 50, 50);
+
+		// make sure the base url has not been duplicated (https://github.com/timber/timber/issues/405)
+		$this->assertLessThanOrEqual( 1, substr_count($resized, 'example.org') );
+		// make sure the image has been resized
+		$resized = TimberUrlHelper::url_to_file_system( $resized );
+		$this->assertTrue( TestTimberImage::checkSize($resized, 50, 50), 'image should be resized' );
+		
+	}
+
+	function testWPMLurlLocal() {
+		// this test replicates the url issue caused by the WPML language identifier in the url
+		// However, WPML can't be installed with composer so this test mocks the WPML plugin
+
+		// WPML uses a filter to alter the home_url
+		$home_url_filter = function( $url ) { return $url.'/en'; };
+		add_filter( 'home_url', $home_url_filter, -10, 4 );
+
+		// test with a local and external file
+		$img = 'arch.jpg';
+		$img = TestTimberImage::copyTestImage($img);
+			
+		$resized = TimberImageHelper::resize($img, 50, 50);
+
+		// make sure the base url has not been duplicated (https://github.com/timber/timber/issues/405)
+		$this->assertLessThanOrEqual( 1, substr_count($resized, 'example.org') );
+		// make sure the image has been resized
+		$resized = TimberUrlHelper::url_to_file_system( $resized );
+		$this->assertTrue( TestTimberImage::checkSize($resized, 50, 50), 'image should be resized' );
+		
 	}
 
 }
