Changeset 6286

Timestamp:

02/06/2017 09:51:42 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Tools: Update file paths for tools unit tests.

Props thebrandonallen. Fixes #3056.

Location:

trunk/tests/phpunit

Files:

• includes/install.php (modified) (2 diffs)
• testcases/admin/tools.php (modified) (1 diff)

trunk/tests/phpunit/includes/install.php

@@ -14 +14 @@
 
 // Pull in the WordPress core test suite
-require_once( $config_file_path );
-require_once( $tests_dir_path . '/includes/functions.php' );
+require_once $config_file_path;
+require_once $tests_dir_path . '/includes/functions.php';
 
 /**
@@ -39 +39 @@
 // Include WordPress
 echo "Loading WordPress via `wp-settings.php`...\n";
-require_once( ABSPATH . '/wp-settings.php' );
+require_once ABSPATH . '/wp-settings.php';
 
 // Fix fussy database settings

trunk/tests/phpunit/testcases/admin/tools.php

@@ -14 +14 @@
         $this->set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
         $this->keymaster_id = get_current_user_id();
+
         bbp_set_user_role( $this->keymaster_id, bbp_get_keymaster_role() );
 
-        if ( ! function_exists( 'bbp_admin_repair' ) ) {
-            require_once( BBP_PLUGIN_DIR . 'includes/admin/tools.php' );
+        if ( ! function_exists( 'bbp_admin_repair_page' ) ) {
+            require_once BBP_PLUGIN_DIR . 'includes/admin/tools/repair.php';
+            require_once BBP_PLUGIN_DIR . 'includes/admin/tools/upgrades.php';
         }
     }