diff --git a/src/Plugin/monitoring/SensorPlugin/UserIntegritySensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/UserIntegritySensorPlugin.php index 836b06c..b896916 100644 --- a/src/Plugin/monitoring/SensorPlugin/UserIntegritySensorPlugin.php +++ b/src/Plugin/monitoring/SensorPlugin/UserIntegritySensorPlugin.php @@ -90,7 +90,7 @@ class UserIntegritySensorPlugin extends SensorPluginBase implements ExtendedInfo $role_ids_after = array_intersect($role_ids, ['authenticated', 'anonymous']); $role_labels = []; foreach (Role::loadMultiple($role_ids_after) as $role) { - $role_labels[$role->id()] = $role->label() . 's'; + $role_labels[$role->id()] = $role->label(); } if (!empty($role_labels)) { diff --git a/src/Tests/MonitoringCoreWebTest.php b/src/Tests/MonitoringCoreWebTest.php index 2a0120a..c806e73 100644 --- a/src/Tests/MonitoringCoreWebTest.php +++ b/src/Tests/MonitoringCoreWebTest.php @@ -190,31 +190,31 @@ class MonitoringCoreWebTest extends MonitoringTestBase { $this->assertTrue($result->isWarning()); // Count users included admin. - $this->assertEqual($result->getMessage(), '3 privileged user(s), Privileged access for roles Authenticated users'); + $this->assertEqual($result->getMessage(), '3 privileged user(s), Privileged access for roles Authenticated user'); // Add permissions to anonymous user and check the sensor. user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('administer account settings')); $result = $this->runSensor('user_integrity'); - $this->assertEqual($result->getMessage(), '3 privileged user(s), Privileged access for roles Anonymous users, Authenticated users'); + $this->assertEqual($result->getMessage(), '3 privileged user(s), Privileged access for roles Anonymous user, Authenticated user'); // Authenticated user with privilege of register. \Drupal::configFactory()->getEditable('user.settings')->set('register', 'visitors')->save(); $result = $this->runSensor('user_integrity'); $this->assertTrue($result->isCritical()); - $this->assertEqual($result->getMessage(), '3 privileged user(s), Privileged access for roles Anonymous users, Authenticated users, Self registration possible.'); + $this->assertEqual($result->getMessage(), '3 privileged user(s), Privileged access for roles Anonymous user, Authenticated user, Self registration possible.'); // Create an authenticated user and test that the sensor counter increments. $test_user_third = $this->drupalCreateUser(array(), 'test_user_3'); \Drupal::keyValue('monitoring.users')->deleteAll(); $result = $this->runSensor('user_integrity'); - $this->assertEqual($result->getMessage(), '4 privileged user(s), Privileged access for roles Anonymous users, Authenticated users, Self registration possible.'); + $this->assertEqual($result->getMessage(), '4 privileged user(s), Privileged access for roles Anonymous user, Authenticated user, Self registration possible.'); $test_user_third->setUsername('changed2'); $test_user_third->save(); // Check sensor message for user changes. $result = $this->runSensor('user_integrity'); - $this->assertEqual($result->getMessage(), '4 privileged user(s), 1 changed user(s), Privileged access for roles Anonymous users, Authenticated users, Self registration possible.'); + $this->assertEqual($result->getMessage(), '4 privileged user(s), 1 changed user(s), Privileged access for roles Anonymous user, Authenticated user, Self registration possible.'); // Check sensor message with permissions revoked. user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, array('administer account settings'));