Skip to content

Commit b266645

Browse files
committed
Use batch results helper for signup activate
1 parent adde1d7 commit b266645

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

features/signup.feature

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Feature: Manage signups in a multisite installation
3131
When I run `wp user signup activate bobuser`
3232
Then STDOUT should contain:
3333
"""
34-
Success: Signup 1 activated.
34+
Success: Activated 1 of 1 signups.
3535
"""
3636

3737
When I run `wp user signup list --fields=signup_id,user_login,user_email,active --format=csv --active=1`
@@ -71,11 +71,11 @@ Feature: Manage signups in a multisite installation
7171
When I run `wp user signup activate bobuser`
7272
Then STDOUT should contain:
7373
"""
74-
Success: Signup 1 activated.
74+
Success: Activated 1 of 1 signups.
7575
"""
7676

7777
When I try the previous command again
78-
Then STDERR should be:
78+
Then STDERR should contain:
7979
"""
8080
Warning: Failed activating signup 1.
8181
"""
@@ -106,11 +106,7 @@ Feature: Manage signups in a multisite installation
106106
When I run `wp user signup activate bobuser johnuser`
107107
Then STDOUT should contain:
108108
"""
109-
Success: Signup 1 activated.
110-
"""
111-
And STDOUT should contain:
112-
"""
113-
Success: Signup 2 activated.
109+
Success: Activated 2 of 2 signups.
114110
"""
115111

116112
When I run `wp user signup list --active=1 --format=count`
@@ -133,7 +129,7 @@ Feature: Manage signups in a multisite installation
133129
When I run `wp user signup activate bobuser`
134130
Then STDOUT should contain:
135131
"""
136-
Success: Signup 1 activated.
132+
Success: Activated 1 of 1 signups.
137133
"""
138134

139135
When I run `wp site list --fields=domain,path`

src/Signup_Command.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,22 @@ public function get( $args, $assoc_args ) {
216216
public function activate( $args, $assoc_args ) {
217217
$signups = $this->fetcher->get_many( $args );
218218

219+
$successes = 0;
220+
$errors = 0;
221+
219222
foreach ( $signups as $signup ) {
220223
$result = wpmu_activate_signup( $signup->activation_key );
221224

222225
if ( is_wp_error( $result ) ) {
223226
WP_CLI::warning( "Failed activating signup {$signup->signup_id}." );
227+
++$errors;
224228
} else {
225229
WP_CLI::success( "Signup {$signup->signup_id} activated. Password: {$result['password']}" );
230+
++$successes;
226231
}
227232
}
233+
234+
Utils\report_batch_operation_results( 'signup', 'activate', count( $args ), $successes, $errors );
228235
}
229236

230237
/**

0 commit comments

Comments
 (0)