Merge pull request #52 from humanmade/fix-tests

Fix tests

Author: rmccue

.travis.yml

@@ -7,4 +7,4 @@ install:
   - npm install
 
 script:
-  - phpunit
+  - vendor/bin/phpunit

HM/bootstrap.php

@@ -90,4 +90,6 @@ function attach_to_runner( $runner ) {
 	}
 }
 
-attach_to_runner( $GLOBALS['runner'] );
+if ( ! empty( $GLOBALS['runner'] ) ) {
+	attach_to_runner( $GLOBALS['runner'] );
+}

tests/FixtureTests.php

@@ -64,10 +64,11 @@ public function test_passing_files( $file ) {
 		$phpcsFile = new LocalFile( $file, $this->ruleset, $this->config );
 		$phpcsFile->process();
 
+		$rel_file = substr( $file, strlen( __DIR__ ) );
 		$foundErrors = $phpcsFile->getErrors();
-		$this->assertEquals( [], $foundErrors, 'File should not contain any errors' );
+		$this->assertEquals( [], $foundErrors, sprintf( 'File %s should not contain any errors', $rel_file ) );
 		$foundWarnings = $phpcsFile->getWarnings();
-		$this->assertEquals( [], $foundWarnings, 'File should not contain any warnings' );
+		$this->assertEquals( [], $foundWarnings, sprintf( 'File %s should not contain any warnings', $rel_file ) );
 	}
 
 	/**

tests/fixtures/pass/inc/namespace.php

@@ -29,6 +29,6 @@ function anonymous_function() {
 
 	return function () use ( $x ) {
 		$x++;
-		return $x;
+		return new WP_Post( $x );
 	};
 }