Skip to content

Commit de71744

Browse files
authored
Merge branch 'main' into feature/pluck-patch-cache-transient
2 parents 9eca4d9 + dec8eae commit de71744

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

.github/workflows/testing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Testing
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
push:
67
branches:

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"wp-cli/wp-cli": "^2.10"
15+
"wp-cli/wp-cli": "^2.12"
1616
},
1717
"require-dev": {
1818
"wp-cli/entity-command": "^1.3 || ^2",
@@ -24,7 +24,8 @@
2424
"allow-plugins": {
2525
"dealerdirect/phpcodesniffer-composer-installer": true,
2626
"johnpbloch/wordpress-core-installer": true
27-
}
27+
},
28+
"lock": false
2829
},
2930
"extra": {
3031
"branch-alias": {

features/transient.feature

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ Feature: Manage WordPress transient cache
6060
# We set `WP_DEVELOPMENT_MODE` to stop WordPress from automatically creating
6161
# additional transients which cause some steps to fail when testing.
6262
And I run `wp config set WP_DEVELOPMENT_MODE all`
63-
And I run `wp config set DISABLE_WP_CRON true --raw`
6463

6564
And I run `wp transient list --format=count`
6665
And save STDOUT as {EXISTING_TRANSIENTS}
@@ -128,10 +127,10 @@ Feature: Manage WordPress transient cache
128127

129128
Scenario: Deleting expired transients on single site
130129
Given a WP install
131-
And I run `wp transient set foo bar 60`
132-
And I run `wp transient set foo2 bar2 60`
133-
And I run `wp transient set foo3 bar3 60 --network`
134-
And I run `wp transient set foo4 bar4 60 --network`
130+
And I run `wp transient set foo bar 600`
131+
And I run `wp transient set foo2 bar2 600`
132+
And I run `wp transient set foo3 bar3 600 --network`
133+
And I run `wp transient set foo4 bar4 600 --network`
135134
# Change timeout to be in the past.
136135
And I run `wp option update _transient_timeout_foo 1321009871`
137136
And I run `wp option update _site_transient_timeout_foo3 1321009871`
@@ -295,12 +294,12 @@ Feature: Manage WordPress transient cache
295294
Scenario: Deleting expired transients on multisite
296295
Given a WP multisite install
297296
And I run `wp site create --slug=foo`
298-
And I run `wp transient set foo bar 60`
299-
And I run `wp transient set foo2 bar2 60`
300-
And I run `wp transient set foo3 bar3 60 --network`
301-
And I run `wp transient set foo4 bar4 60 --network`
302-
And I run `wp --url=example.com/foo transient set foo5 bar5 60 --network`
303-
And I run `wp --url=example.com/foo transient set foo6 bar6 60 --network`
297+
And I run `wp transient set foo bar 600`
298+
And I run `wp transient set foo2 bar2 600`
299+
And I run `wp transient set foo3 bar3 600 --network`
300+
And I run `wp transient set foo4 bar4 600 --network`
301+
And I run `wp --url=example.com/foo transient set foo5 bar5 600 --network`
302+
And I run `wp --url=example.com/foo transient set foo6 bar6 600 --network`
304303
# Change timeout to be in the past.
305304
And I run `wp option update _transient_timeout_foo 1321009871`
306305
And I run `wp site option update _site_transient_timeout_foo3 1321009871`

0 commit comments

Comments
 (0)