diff --git a/core/profiles/minimal/config/install/user.settings.yml b/core/profiles/minimal/config/install/user.settings.yml index 39c032288a38becd9b8c04f79dc788a270a79fd1..cdc311b3c7d635bf869a510a6475cb64cb0e52ba 100644 --- a/core/profiles/minimal/config/install/user.settings.yml +++ b/core/profiles/minimal/config/install/user.settings.yml @@ -10,7 +10,7 @@ notify: register_admin_created: true register_no_approval_required: true register_pending_approval: true -register: visitors_admin_approval +register: admin_only cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true diff --git a/core/profiles/minimal/tests/src/Functional/MinimalTest.php b/core/profiles/minimal/tests/src/Functional/MinimalTest.php index ffea86934e668ba411f76a23c71781ad80b5afc3..365273dbc96ec1fcf8bdc92f8ffee165d570dc21 100644 --- a/core/profiles/minimal/tests/src/Functional/MinimalTest.php +++ b/core/profiles/minimal/tests/src/Functional/MinimalTest.php @@ -32,7 +32,9 @@ class MinimalTest extends BrowserTestBase { public function testMinimal() { $this->drupalGet(''); // Check the login block is present. - $this->assertSession()->linkExists('Create new account'); + $this->assertSession()->buttonExists('Log in'); + // Confirm anonymous users cannot create an account. + $this->assertSession()->linkNotExists('Create new account'); $this->assertSession()->statusCodeEquals(200); // Create a user to test tools and navigation blocks for logged in users @@ -60,7 +62,7 @@ public function testMinimal() { // Ensure special configuration overrides are correct. $this->assertFalse($this->config('system.theme.global')->get('features.node_user_picture'), 'Configuration system.theme.global:features.node_user_picture is FALSE.'); - $this->assertEquals(UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL, $this->config('user.settings')->get('register')); + $this->assertEquals(UserInterface::REGISTER_ADMINISTRATORS_ONLY, $this->config('user.settings')->get('register')); // Now we have all configuration imported, test all of them for schema // conformance. Ensures all imported default configuration is valid when diff --git a/core/profiles/standard/config/install/user.settings.yml b/core/profiles/standard/config/install/user.settings.yml index 39c032288a38becd9b8c04f79dc788a270a79fd1..cdc311b3c7d635bf869a510a6475cb64cb0e52ba 100644 --- a/core/profiles/standard/config/install/user.settings.yml +++ b/core/profiles/standard/config/install/user.settings.yml @@ -10,7 +10,7 @@ notify: register_admin_created: true register_no_approval_required: true register_pending_approval: true -register: visitors_admin_approval +register: admin_only cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true diff --git a/core/recipes/standard/recipe.yml b/core/recipes/standard/recipe.yml index ae577ff8a905900315924be30fa0ac4531fd213d..cff95d649c5452ac0c0dc32e721ed32a0d277a15 100644 --- a/core/recipes/standard/recipe.yml +++ b/core/recipes/standard/recipe.yml @@ -81,5 +81,5 @@ config: user.settings: simple_config_update: verify_mail: true - register: visitors_admin_approval + register: admin_only cancel_method: user_cancel_block