From 04237900a6ac4f408aa4e9c9dc756ee10696724b Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@git.wordpress.org>
Date: Tue, 14 Jul 2015 03:07:13 +0000
Subject: [PATCH] Require dependencies when appropriate in some unit test
 files.

Previously, attempting to run certain test files in isolation would resultin
fatal errors, as the parent classes had not been loaded.

Props isaacchapman.
Fixes #32984.

git-svn-id: https://develop.svn.wordpress.org/trunk@33250 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/filesystem/find_folder.php    | 2 ++
 tests/phpunit/tests/image/editor.php              | 2 ++
 tests/phpunit/tests/import/import.php             | 2 ++
 tests/phpunit/tests/import/parser.php             | 2 ++
 tests/phpunit/tests/import/postmeta.php           | 2 ++
 tests/phpunit/tests/query/verboseRewriteRules.php | 2 +-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/filesystem/find_folder.php b/tests/phpunit/tests/filesystem/find_folder.php
index b623ac664b..657e607ecd 100644
--- a/tests/phpunit/tests/filesystem/find_folder.php
+++ b/tests/phpunit/tests/filesystem/find_folder.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once dirname( __FILE__ ) . '/base.php';
+
 /**
  * @group filesystem
  * @group wp-filesystem
diff --git a/tests/phpunit/tests/image/editor.php b/tests/phpunit/tests/image/editor.php
index 14261e73f3..da57c2b406 100644
--- a/tests/phpunit/tests/image/editor.php
+++ b/tests/phpunit/tests/image/editor.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once dirname( __FILE__ ) . '/base.php';
+
 /**
  * Test the WP_Image_Editor base class
  * @group image
diff --git a/tests/phpunit/tests/import/import.php b/tests/phpunit/tests/import/import.php
index 73a8b44028..e253a9b788 100644
--- a/tests/phpunit/tests/import/import.php
+++ b/tests/phpunit/tests/import/import.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once dirname( __FILE__ ) . '/base.php';
+
 /**
  * @group import
  */
diff --git a/tests/phpunit/tests/import/parser.php b/tests/phpunit/tests/import/parser.php
index 30b025bf18..e48fbf7dcc 100644
--- a/tests/phpunit/tests/import/parser.php
+++ b/tests/phpunit/tests/import/parser.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once dirname( __FILE__ ) . '/base.php';
+
 /**
  * @group import
  */
diff --git a/tests/phpunit/tests/import/postmeta.php b/tests/phpunit/tests/import/postmeta.php
index d6d597dd06..0fd8daedf2 100644
--- a/tests/phpunit/tests/import/postmeta.php
+++ b/tests/phpunit/tests/import/postmeta.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once dirname( __FILE__ ) . '/base.php';
+
 /**
  * @group import
  */
diff --git a/tests/phpunit/tests/query/verboseRewriteRules.php b/tests/phpunit/tests/query/verboseRewriteRules.php
index b6c05c42b5..ae71dfa1ca 100644
--- a/tests/phpunit/tests/query/verboseRewriteRules.php
+++ b/tests/phpunit/tests/query/verboseRewriteRules.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname( dirname( __FILE__ ) ) . '/query.php';
+require_once dirname( __FILE__ ) . '/conditionals.php';
 
 /**
  * @group query