Skip to content

Commit 9c0c05d

Browse files
authored
Merge pull request #56 from wp-cli/scaffold-tests-readme-12-8
Update scaffolded tests and README to latest
2 parents e097988 + cac24a4 commit 9c0c05d

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ branches:
1414

1515
cache:
1616
directories:
17-
- vendor
1817
- $HOME/.composer/cache
1918

2019
env:
@@ -25,7 +24,7 @@ env:
2524
matrix:
2625
include:
2726
- php: 7.2
28-
env: WP_VERSION=nightly
27+
env: WP_VERSION=latest
2928
- php: 7.1
3029
env: WP_VERSION=latest
3130
- php: 7.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Once you've decided to commit the time to seeing your pull request through, [ple
176176

177177
## Support
178178

179-
Github issues aren't for general support questions, but there are other venues you can try: http://wp-cli.org/#support
179+
Github issues aren't for general support questions, but there are other venues you can try: https://wp-cli.org/#support
180180

181181

182182
*This README.md is generated dynamically from the project's codebase using `wp scaffold package-readme` ([doc](https://github.com/wp-cli/scaffold-package-command#wp-scaffold-package-readme)). To suggest changes, please submit a pull request against the corresponding part of the codebase.*

features/bootstrap/FeatureContext.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
class FeatureContext extends BehatContext implements ClosuredContextInterface {
4646

4747
/**
48-
* The current working directory for scenarios that have a "Given a WP install" or "Given an empty directory" step. Variable RUN_DIR. Lives until the end of the scenario.
48+
* The current working directory for scenarios that have a "Given a WP installation" or "Given an empty directory" step. Variable RUN_DIR. Lives until the end of the scenario.
4949
*/
5050
private static $run_dir;
5151

5252
/**
53-
* Where WordPress core is downloaded to for caching, and which is copied to RUN_DIR during a "Given a WP install" step. Lives until manually deleted.
53+
* Where WordPress core is downloaded to for caching, and which is copied to RUN_DIR during a "Given a WP installation" step. Lives until manually deleted.
5454
*/
5555
private static $cache_dir;
5656

5757
/**
58-
* The directory that holds the install cache, and which is copied to RUN_DIR during a "Given a WP install" step. Recreated on each suite run.
58+
* The directory that holds the install cache, and which is copied to RUN_DIR during a "Given a WP installation" step. Recreated on each suite run.
5959
*/
6060
private static $install_cache_dir;
6161

@@ -72,7 +72,7 @@ class FeatureContext extends BehatContext implements ClosuredContextInterface {
7272
private static $composer_local_repository;
7373

7474
/**
75-
* The test database settings. All but `dbname` can be set via environment variables. The database is dropped at the start of each scenario and created on a "Given a WP install" step.
75+
* The test database settings. All but `dbname` can be set via environment variables. The database is dropped at the start of each scenario and created on a "Given a WP installation" step.
7676
*/
7777
private static $db_settings = array(
7878
'dbname' => 'wp_cli_test',

features/steps/given.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,31 @@ function ( $world ) {
6969
}
7070
);
7171

72-
$steps->Given( '/^a WP install$/',
72+
$steps->Given( '/^a WP (install|installation)$/',
7373
function ( $world ) {
7474
$world->install_wp();
7575
}
7676
);
7777

78-
$steps->Given( "/^a WP install in '([^\s]+)'$/",
79-
function ( $world, $subdir ) {
78+
$steps->Given( "/^a WP (install|installation) in '([^\s]+)'$/",
79+
function ( $world, $_, $subdir ) {
8080
$world->install_wp( $subdir );
8181
}
8282
);
8383

84-
$steps->Given( '/^a WP install with Composer$/',
84+
$steps->Given( '/^a WP (install|installation) with Composer$/',
8585
function ( $world ) {
8686
$world->install_wp_with_composer();
8787
}
8888
);
8989

90-
$steps->Given( "/^a WP install with Composer and a custom vendor directory '([^\s]+)'$/",
91-
function ( $world, $vendor_directory ) {
90+
$steps->Given( "/^a WP (install|installation) with Composer and a custom vendor directory '([^\s]+)'$/",
91+
function ( $world, $_, $vendor_directory ) {
9292
$world->install_wp_with_composer( $vendor_directory );
9393
}
9494
);
9595

96-
$steps->Given( '/^a WP multisite (subdirectory|subdomain)?\s?install$/',
96+
$steps->Given( '/^a WP multisite (subdirectory|subdomain)?\s?(install|installation)$/',
9797
function ( $world, $type = 'subdirectory' ) {
9898
$world->install_wp();
9999
$subdomains = ! empty( $type ) && 'subdomain' === $type ? 1 : 0;

0 commit comments

Comments
 (0)