Update PHPUnit tests to use WPPPB

Uses Composer's autoloading to load HTTP testcase now too.
WordPoints · Dec 5, 2016 · f1f983c · f1f983c
1 parent a525d5d
commit f1f983c
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+dev-lib/git/.gitignore
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,9 @@ before_script:
 
 script:
     - codesniff-php-syntax
+    - codesniff-php-autoloaders
     - codesniff-phpcs
+    - codesniff-strings
     - codesniff-jshint
     - codesniff-l10n
     - codesniff-xmllint
@@ -70,6 +72,7 @@ script:
     - phpunit-ajax
     - phpunit-ms-ajax
     - phpunit-ms-network-ajax
+    - wpcept-run
 
 after_script:
     - source $DEV_LIB_PATH/travis/after_script.sh
diff --git a/composer.json b/composer.json
@@ -3,7 +3,19 @@
         "php": ">=5.2.0"
     },
     "require-dev": {
-        "wordpoints/module-uninstall-tester": "^0.4.0",
-        "jdgrimes/wp-http-testcase": "~1.2"
+        "jdgrimes/wp-http-testcase": "^1.2.3",
+        "jdgrimes/wpppb": "^0.2.2",
+        "xrstf/composer-php52": "^1.0"
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "xrstf\\Composer52\\Generator::onPostInstallCmd"
+        ],
+        "post-update-cmd": [
+            "xrstf\\Composer52\\Generator::onPostInstallCmd"
+        ],
+        "post-autoload-dump": [
+            "xrstf\\Composer52\\Generator::onPostInstallCmd"
+        ]
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/dev-lib b/dev-lib
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,9 +8,4 @@
 			<directory suffix=".php">tests/phpunit/tests/</directory>
 		</testsuite>
 	</testsuites>
-	<groups>
-		<exclude>
-			<group>uninstall</group>
-		</exclude>
-	</groups>
 </phpunit>
diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
@@ -7,15 +7,11 @@
  * @since 1.0.0
  */
 
-/**
- * The WP HTTP testcase bootstrap.
- *
- * @since 1.1.0
- */
-require_once WORDPOINTSORG_TESTS_DIR . '/../../vendor/jdgrimes/wp-http-testcase/wp-http-testcase.php';
+if ( ! WordPoints_PHPUnit_Bootstrap_Loader::instance()->running_uninstall_tests() ) {
 
-if ( ! running_wordpoints_module_uninstall_tests() ) {
 	WP_HTTP_TestCase::init();
+
+	add_filter( 'wordpoints_modules_dir', 'wordpointsorgtests_modules_dir', 20 );
 }
 
 /**

diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php
@@ -16,11 +16,6 @@
  */
 define( 'WORDPOINTSORG_TESTS_DIR', dirname( dirname( __FILE__ ) ) );
 
-/**
- * @since 1.1.0
- */
-define( 'WORDPOINTS_TESTS_LOAD_MODULE_ADMIN', WORDPOINTSORG_TESTS_DIR . '/../../src/admin/admin.php' );
-
 /**
  * @since 1.1.0
  */
@@ -54,8 +49,4 @@ function wordpointsorgtests_modules_dir() {
 	return WORDPOINTSORG_TESTS_DIR . '/data/modules/';
 }
 
-if ( ! running_wordpoints_module_uninstall_tests() ) {
-	tests_add_filter( 'wordpoints_modules_dir', 'wordpointsorgtests_modules_dir', 20 );
-}
-
 // EOF
diff --git a/tests/phpunit/tests/uninstall.php → tests/phpunit/test-uninstall.php b/tests/phpunit/tests/uninstall.php → tests/phpunit/test-uninstall.php
@@ -11,15 +11,8 @@
  * Test that the module installs and uninstalls itself properly.
  *
  * @since 1.0.0
- *
- * @group uninstall
  */
-class WordPointsOrg_Uninstall_Test extends WordPoints_Module_Uninstall_UnitTestCase {
-
-	/**
-	 * @since 1.1.3
-	 */
-	protected $module_file = 'wordpointsorg/wordpointsorg.php';
+class WordPointsOrg_Uninstall_Test extends WordPoints_Dev_Lib_PHPUnit_TestCase_Module_Uninstall {
 
 	/**
 	 * Test that install and uninstall work as expected.
+14 −0		phpunit/module-bootstrap.php
+1 −1		phpunit/phpunit.uninstall.xml.dist