Changeset 40240

Timestamp:

03/08/2017 12:04:05 AM (10 years ago)

Author:

johnbillion

Message:

Build/Test tools: Revert [40239] due to unrelated changes.

See #39486

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (2 diffs)
• tests/phpunit/includes/functions.php (modified) (1 diff)
• tests/phpunit/includes/testcase.php (modified) (1 diff)
• tests/phpunit/tests/basic.php (modified) (1 diff)
• tests/phpunit/tests/external-http/basic.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -901 +901 @@
         do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' );
 
-        /**
-         * Allows preventing auth cookies from actually being sent to the client.
-         *
-         * @since 4.7.4
-         *
-         * @param bool $send Whether to send auth cookies to the client.
-         */
-        if ( ! apply_filters( 'send_auth_cookies', true ) ) {
-                return;
-        }
-
         setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
         setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
@@ -933 +922 @@
          */
         do_action( 'clear_auth_cookie' );
-
-        /**
-         * Allows preventing auth cookies from actually being sent to the client.
-         *
-         * @since 4.7.4
-         *
-         * @param bool $send Whether to send auth cookies to the client.
-         */
-        if ( ! apply_filters( 'send_auth_cookies', true ) ) {
-                return;
-        }
 
         setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );

trunk/tests/phpunit/includes/functions.php

@@ -165 +165 @@
 // Skip `setcookie` calls in auth_cookie functions due to warning:
 // Cannot modify header information - headers already sent by ...
-tests_add_filter( 'send_auth_cookies', '__return_false' );
+
+function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
+        $auth_cookie = null;
+        $expire = null;
+        $expiration = null;
+        $user_id = null;
+        $scheme = null;
+        /** This action is documented in wp-inclues/pluggable.php */
+        do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme );
+        $logged_in_cookie = null;
+        /** This action is documented in wp-inclues/pluggable.php */
+        do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' );
+}
+
+function wp_clear_auth_cookie() {
+        /** This action is documented in wp-inclues/pluggable.php */
+        do_action( 'clear_auth_cookie' );
+}

trunk/tests/phpunit/includes/testcase.php

@@ -175 +175 @@
                 $_POST = array();
                 self::flush_cache();
-        }
-
-        /**
-         * Allow tests to be skipped on some automated runs
-         *
-         * For test runs on Travis for something other than trunk/master 
-         * we want to skip tests that only need to run for master.
-         */
-        public function skipOnAutomatedBranches() {
-                // gentenv can be disabled
-                if ( ! function_exists( 'getenv' ) ) {
-                        return false;
-                }
-
-                // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
-                $travis_branch       = getenv( 'TRAVIS_BRANCH' );
-                $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' );
-
-                if ( false !== $travis_pull_request && 'master' !== $travis_branch ) {
-                        $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
-                }
         }
 

trunk/tests/phpunit/tests/basic.php

@@ -9 +9 @@
 
         function test_license() {
-                // This test is designed to only run on trunk/master
-                $this->skipOnAutomatedBranches();
-
                 $license = file_get_contents( ABSPATH . 'license.txt' );
                 preg_match( '#Copyright 2011-(\d+) by the contributors#', $license, $matches );

trunk/tests/phpunit/tests/external-http/basic.php

@@ -6 +6 @@
 
         function test_readme() {
-                // This test is designed to only run on trunk/master
-                $this->skipOnAutomatedBranches();
-
                 $readme = file_get_contents( ABSPATH . 'readme.html' );