Changeset 40287 for branches/4.1

Timestamp:

03/13/2017 10:37:53 PM (9 years ago)

Author:

ocean90

Message:

Tests: Use https URLs for wordpress.com assets in Tests_HTTP_Functions and Tests_Image_Functions.

Merge of [31258] and [31259] to the 4.1 branch.
See #31091.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/http/functions.php (modified) (6 diffs)
• tests/phpunit/tests/image/functions.php (modified) (2 diffs)

branches/4.1/tests/phpunit/tests/http/functions.php

@@ -6 +6 @@
  */
 class Tests_HTTP_Functions extends WP_UnitTestCase {
+        public function setUp() {
+                if ( ! extension_loaded( 'openssl' ) ) {
+                        $this->markTestSkipped( 'Tests_HTTP_Functions requires openssl.' );
+                }
+
+                parent::setUp();
+        }
+
         function test_head_request() {
                 // this url give a direct 200 response
-                $url = 'http://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
+                $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
                 $response = wp_remote_head( $url );
                 $headers = wp_remote_retrieve_headers( $response );
@@ -20 +28 @@
         function test_head_redirect() {
                 // this url will 301 redirect
-                $url = 'http://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
+                $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
                 $response = wp_remote_head( $url );
                 $this->assertEquals( '301', wp_remote_retrieve_response_code( $response ) );
@@ -26 +34 @@
 
         function test_head_404() {
-                $url = 'http://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
+                $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
                 $headers = wp_remote_head( $url );
 
@@ -34 +42 @@
 
         function test_get_request() {
-                $url = 'http://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
+                $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
                 $file = tempnam('/tmp', 'testfile');
 
@@ -52 +60 @@
         function test_get_redirect() {
                 // this will redirect to asdftestblog1.files.wordpress.com
-                $url = 'http://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
+                $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
                 $file = tempnam('/tmp', 'testfile');
 
@@ -70 +78 @@
         function test_get_redirect_limit_exceeded() {
                 // this will redirect to asdftestblog1.files.wordpress.com
-                $url = 'http://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
+                $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
                 $file = tempnam('/tmp', 'testfile');
                 // pretend we've already redirected 5 times

branches/4.1/tests/phpunit/tests/image/functions.php

@@ -293 +293 @@
                         $this->markTestSkipped( 'jpeg support unavailable' );
 
-                $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
+                if ( ! extension_loaded( 'openssl' ) ) {
+                        $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url() requires openssl.' );
+                }
+
+                $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
                                                           0, 0, 100, 100, 100, 100, false,
                                                           DIR_TESTDATA . '/images/' . rand_str() . '.jpg' );
@@ -313 +317 @@
 
         public function test_wp_crop_image_url_not_exist() {
-                $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
+                if ( ! extension_loaded( 'openssl' ) ) {
+                        $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url_not_exist() requires openssl.' );
+                }
+
+                $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
                                                           0, 0, 100, 100, 100, 100 );
                 $this->assertInstanceOf( 'WP_Error', $file );