Merge pull request #3392 from wp-cli/3383-fix-no-version

danielbachhuber · web-flow · commit 755bfaa879ef · 2016-09-10T09:03:10.000-07:00
Fix Exception in test suite when no `WP_VERSION` is provided
diff --git a/ci/prepare.sh b/ci/prepare.sh
@@ -30,9 +30,5 @@ echo $CLI_VERSION > PHAR_BUILD_VERSION
 # Install CodeSniffer things
 ./ci/prepare-codesniffer.sh
 
-./bin/wp core download --version=$WP_VERSION --path='/tmp/wp-cli-test core-download-cache/'
-
-./bin/wp core version --path='/tmp/wp-cli-test core-download-cache/'
-
 mysql -e 'CREATE DATABASE wp_cli_test;' -uroot
 mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test.* TO "wp_cli_test"@"localhost" IDENTIFIED BY "password1"' -uroot
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -77,8 +77,10 @@ private static function cache_wp_files() {
 		if ( is_readable( self::$cache_dir . '/wp-config-sample.php' ) )
 			return;
 
-		$version = getenv( 'WP_VERSION' ) ? '--version=' . getenv( 'WP_VERSION' ) : '';
-		$cmd = Utils\esc_cmd( 'wp core download --force --path=%s %s', self::$cache_dir, $version );
+		$cmd = Utils\esc_cmd( 'wp core download --force --path=%s', self::$cache_dir );
+		if ( getenv( 'WP_VERSION' ) ) {
+			$cmd .= Utils\esc_cmd( ' --version=%s', getenv( 'WP_VERSION' ) );
+		}
 		Process::create( $cmd, null, self::get_process_env_variables() )->run_check();
 	}
 
@@ -91,6 +93,9 @@ public static function prepare( SuiteEvent $event ) {
 		echo $result->stdout;
 		echo PHP_EOL;
 		self::cache_wp_files();
+		$result = Process::create( Utils\esc_cmd( 'wp core version --path=%s', self::$cache_dir ) , null, self::get_process_env_variables() )->run_check();
+		echo 'WordPress ' . $result->stdout;
+		echo PHP_EOL;
 	}
 
 	/**
