Changeset 34703

Timestamp:

09/29/2015 09:43:04 PM (9 years ago)

Author:

johnbillion

Message:

force_ssl_login() has been functionally identical to force_ssl_admin() since 4.0 (#10267), so its test assertions can be removed as the function has been deprecated in [34700]. The remaining assertions suitably cover force_ssl_admin().

See #34011

File:

• trunk/tests/phpunit/tests/url.php (modified) (3 diffs)

trunk/tests/phpunit/tests/url.php

@@ -241 +241 @@
 
         $forced_admin = force_ssl_admin();
-        $forced_login = force_ssl_login();
         $i = 0;
         foreach ( $links as $link ) {
@@ -254 +253 @@
             $this->assertEquals( $http_links[ $i ], set_url_scheme( $link ) );
 
-            force_ssl_login( false );
             force_ssl_admin( true );
             $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'admin' ) );
@@ -267 +265 @@
             $this->assertEquals( $http_links[ $i ], set_url_scheme( $link, 'rpc' ) );
 
-            force_ssl_login( true );
-            $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'admin' ) );
-            $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'login_post' ) );
-            $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'login' ) );
-            $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'rpc' ) );
-
             $i++;
         }
 
         force_ssl_admin( $forced_admin );
-        force_ssl_login( $forced_login );
     }