diff --git a/core/modules/tour/src/Tests/TourTestBase.php b/core/modules/tour/src/Tests/TourTestBase.php index 198051d370..e139650706 100644 --- a/core/modules/tour/src/Tests/TourTestBase.php +++ b/core/modules/tour/src/Tests/TourTestBase.php @@ -4,8 +4,13 @@ use Drupal\simpletest\WebTestBase; +@trigger_error('\Drupal\tour\Tests\TourTestBase is deprecated in 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\tour\Functional\TourTestBase.', E_USER_DEPRECATED); + /** * Base class for testing Tour functionality. + * + * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. + * Use \Drupal\Tests\tour\Functional\TourTestBase instead. */ abstract class TourTestBase extends WebTestBase { diff --git a/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php b/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php index ff2e9e586e..daed6fa292 100644 --- a/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php +++ b/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php @@ -3,7 +3,7 @@ namespace Drupal\Tests\tour\Functional; use Drupal\Core\Url; -use Drupal\system\Tests\Cache\PageCacheTagsTestBase; +use Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase; use Drupal\tour\Entity\Tour; use Drupal\user\Entity\Role; use Drupal\user\RoleInterface; diff --git a/core/modules/tour/src/Tests/TourHelpPageTest.php b/core/modules/tour/tests/src/Functional/TourHelpPageTest.php similarity index 95% rename from core/modules/tour/src/Tests/TourHelpPageTest.php rename to core/modules/tour/tests/src/Functional/TourHelpPageTest.php index 8a41eb9fb9..ad60df104f 100644 --- a/core/modules/tour/src/Tests/TourHelpPageTest.php +++ b/core/modules/tour/tests/src/Functional/TourHelpPageTest.php @@ -1,15 +1,15 @@ assertText($title); - $this->assertNoLink($title); + $this->assertSession()->linkNotExistsExact($title); } else { $this->assertNoText($title); diff --git a/core/modules/tour/src/Tests/TourTest.php b/core/modules/tour/tests/src/Functional/TourTest.php similarity index 99% rename from core/modules/tour/src/Tests/TourTest.php rename to core/modules/tour/tests/src/Functional/TourTest.php index 749e7c5a3e..55f3743f61 100644 --- a/core/modules/tour/src/Tests/TourTest.php +++ b/core/modules/tour/tests/src/Functional/TourTest.php @@ -1,6 +1,6 @@ elements inside