WordPress.org
Get WordPress

Make WordPress Core

Changeset 1100 in tests


Ignore:
Timestamp:
10/31/2012 05:57:58 PM (12 years ago)
Author:
scribu
Message:

move bootstrap.php and install.php to includes directory

fixes #137

Location:
trunk
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/includes/bootstrap.php

    r1099 r1100  
    88require_once 'PHPUnit/Autoload.php';
    99
    10 $config_file_path = dirname( __FILE__ ) . '/wp-tests-config.php';
     10$config_file_path = dirname( __FILE__ ) . '/../wp-tests-config.php';
    1111
    1212/*
    … …  
    4343$multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
    4444
    45 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
     45system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
    4646
    4747if ( $multisite ) {
    … …  
    5959unset( $multisite );
    6060
    61 require dirname( __FILE__ ) . '/includes/functions.php';
     61require dirname( __FILE__ ) . '/functions.php';
    6262
    6363// Preset WordPress options defined in bootstrap file.
    … …  
    8080_delete_all_posts();
    8181
    82 require dirname( __FILE__ ) . '/includes/testcase.php';
    83 require dirname( __FILE__ ) . '/includes/testcase-xmlrpc.php';
    84 require dirname( __FILE__ ) . '/includes/testcase-ajax.php';
    85 require dirname( __FILE__ ) . '/includes/exceptions.php';
    86 require dirname( __FILE__ ) . '/includes/utils.php';
     82require dirname( __FILE__ ) . '/testcase.php';
     83require dirname( __FILE__ ) . '/testcase-xmlrpc.php';
     84require dirname( __FILE__ ) . '/testcase-ajax.php';
     85require dirname( __FILE__ ) . '/exceptions.php';
     86require dirname( __FILE__ ) . '/utils.php';
    8787
    8888/**

  • trunk/multisite.xml

    r1023 r1100  
    11<phpunit
    2         bootstrap="bootstrap.php"
     2        bootstrap="includes/bootstrap.php"
    33        backupGlobals="false"
    44        colors="true"

  • trunk/phpunit.xml

    r963 r1100  
    11<phpunit
    2         bootstrap="bootstrap.php"
     2        bootstrap="includes/bootstrap.php"
    33        backupGlobals="false"
    44        colors="true"
Note: See TracChangeset for help on using the changeset viewer.