From c02abdd17aeea829c3de31de19f236b7d25ccf4c Mon Sep 17 00:00:00 2001
From: eiriksm <eiriksm@1014468.no-reply.drupal.org>
Date: Fri, 3 Jul 2020 16:08:52 +0200
Subject: [PATCH] Issue #3138122 by eiriksm, esolitos, acbramley: Drupal 9
compatibility
---
create_user_permission.info.yml | 1 +
.../PermissionTest.php | 16 ++++++++++++----
.../RegistrationTest.php | 0
tests/src/Functional/UserNotBlockedTest.php | 7 ++++++-
tests/src/FunctionalJavascript/CanNotifyTest.php | 13 +++++++++----
5 files changed, 28 insertions(+), 9 deletions(-)
rename tests/src/{FunctionalJavascript => Functional}/PermissionTest.php (76%)
rename tests/src/{FunctionalJavascript => Functional}/RegistrationTest.php (100%)
diff --git a/create_user_permission.info.yml b/create_user_permission.info.yml
index 306411e..e5087da 100644
--- a/create_user_permission.info.yml
+++ b/create_user_permission.info.yml
@@ -1,4 +1,5 @@
name: Create user permission
description: Provides a permission to "create users", instead of having to "administer users"
core: 8.x
+core_version_requirement: '^8 || ^9'
type: module
diff --git a/tests/src/FunctionalJavascript/PermissionTest.php b/tests/src/Functional/PermissionTest.php
similarity index 76%
rename from tests/src/FunctionalJavascript/PermissionTest.php
rename to tests/src/Functional/PermissionTest.php
index ba1e323..126d848 100644
--- a/tests/src/FunctionalJavascript/PermissionTest.php
+++ b/tests/src/Functional/PermissionTest.php
@@ -1,17 +1,25 @@
<?php
-namespace Drupal\Tests\create_user_permission\FunctionalJavascript;
+namespace Drupal\Tests\create_user_permission\Functional;
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\Tests\BrowserTestBase;
/**
* Tests the JavaScript functionality of the Create user permission module.
*
* @group create_user_permission
*/
-class PermissionTest extends JavascriptTestBase {
+class PermissionTest extends BrowserTestBase {
- public static $modules = [
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
'create_user_permission',
];
diff --git a/tests/src/FunctionalJavascript/RegistrationTest.php b/tests/src/Functional/RegistrationTest.php
similarity index 100%
rename from tests/src/FunctionalJavascript/RegistrationTest.php
rename to tests/src/Functional/RegistrationTest.php
diff --git a/tests/src/Functional/UserNotBlockedTest.php b/tests/src/Functional/UserNotBlockedTest.php
index b0665e8..8f7bdcf 100644
--- a/tests/src/Functional/UserNotBlockedTest.php
+++ b/tests/src/Functional/UserNotBlockedTest.php
@@ -14,7 +14,12 @@ class UserNotBlockedTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['create_user_permission'];
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['create_user_permission'];
/**
* Test that users created are not blocked.
diff --git a/tests/src/FunctionalJavascript/CanNotifyTest.php b/tests/src/FunctionalJavascript/CanNotifyTest.php
index 38850ad..d210c04 100644
--- a/tests/src/FunctionalJavascript/CanNotifyTest.php
+++ b/tests/src/FunctionalJavascript/CanNotifyTest.php
@@ -1,20 +1,25 @@
<?php
-namespace Drupal\Tests\create_user_permission\FunctionalJavascript;
+namespace Drupal\Tests\create_user_permission\Functional;
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/**
* Test that "create users" able users can notify users about the new account.
*
* @group create_user_permission
*/
-class CanNotifyTest extends JavascriptTestBase {
+class CanNotifyTest extends WebDriverTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['create_user_permission'];
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['create_user_permission'];
/**
* Test that we can check the "notify user" checkbox.
--
GitLab