Skip to:
Content

BuddyPress.org

Changeset 7421


Ignore:
Timestamp:
10/11/2013 06:58:12 PM (11 years ago)
Author:
boonebgorges
Message:

Improve compatibility with develop.svn.wordpress.org unit test suite

This changeset ensures that the BP tests can be run from within a
develop.svn.wordpress.org setup. Backward compatibility for custom locations
using the WP_TESTS_DIR environment variable is maintained.

Fixes #5200

Location:
trunk/tests
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/bootstrap.php

    r6997 r7421  
    77}
    88
    9 require_once getenv( 'WP_TESTS_DIR' ) . '/includes/functions.php';
     9/**
     10 * In the pre-develop.svn WP development environment, an environmental bash
     11 * variable would be set to run PHP Unit tests. However, this has been done
     12 * away with in a post-develop.svn world. We'll still check if this variable
     13 * is set for backwards compat.
     14 */
     15if ( getenv( 'WP_TESTS_DIR' ) ) {
     16    define( 'WP_TESTS_DIR', getenv( 'WP_TESTS_DIR' ) );
     17    define( 'WP_TESTS_CONFIG_PATH', WP_TESTS_DIR . '/wp-tests-config.php' );
     18}
     19else {
     20    define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) );
     21    define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
     22    define( 'WP_TESTS_CONFIG_PATH', WP_ROOT_DIR . '/wp-tests-config.php' );
     23}
     24
     25if ( ! file_exists( WP_TESTS_DIR . '/includes/functions.php' ) )
     26    die( 'The WordPress PHPUnit test suite could not be found.' );
     27
     28require_once WP_TESTS_DIR . '/includes/functions.php';
    1029
    1130function _install_and_load_buddypress() {
     
    1433tests_add_filter( 'muplugins_loaded', '_install_and_load_buddypress' );
    1534
    16 require getenv( 'WP_TESTS_DIR' ) . '/includes/bootstrap.php';
     35require WP_TESTS_DIR . '/includes/bootstrap.php';
    1736
    1837// Load the BP-specific testing tools
  • trunk/tests/includes/install.php

    r7187 r7421  
    99
    1010$config_file_path = $argv[1];
    11 $multisite = ! empty( $argv[2] );
     11$tests_dir_path = $argv[2];
     12$multisite = ! empty( $argv[3] );
    1213
    1314require_once $config_file_path;
    14 require_once dirname( $config_file_path ) . '/includes/functions.php';
     15require_once $tests_dir_path . '/includes/functions.php';
    1516
    1617function _load_buddypress() {
  • trunk/tests/includes/loader.php

    r6905 r7421  
    11<?php
    2 
    3 // Install BP
    4 $config_file_path = getenv( 'WP_TESTS_DIR' ) . '/wp-tests-config.php';
    52$multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
    6 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
     3system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( WP_TESTS_CONFIG_PATH ) . ' ' . escapeshellarg( WP_TESTS_DIR ) . ' ' . $multisite );
    74
    85// Bootstrap BP
Note: See TracChangeset for help on using the changeset viewer.