Pull merge.

[yaffs-website] / web / core / modules / views / tests / src / FunctionalJavascript / GlossaryViewTest.php

diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
index 3611829e8c9479a0f0723978559d8018d0512cc7..d4760e59b41babb67642ae3f8fd38b75a211ec93 100644 (file)
--- a/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\views\FunctionalJavascript;
 
 use Drupal\Core\Url;
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\ContentTypeCreationTrait;
 use Drupal\simpletest\NodeCreationTrait;
@@ -14,7 +14,7 @@ use Drupal\views\Tests\ViewTestData;
  *
  * @group node
  */
-class GlossaryViewTest extends JavascriptTestBase {
+class GlossaryViewTest extends WebDriverTestBase {
 
   use ContentTypeCreationTrait;
   use NodeCreationTrait;
@@ -30,12 +30,6 @@ class GlossaryViewTest extends JavascriptTestBase {
    */
   public static $testViews = ['test_glossary'];
 
-  /**
-   * @var
-   * The additional language to use.
-   */
-  protected $language;
-
   /**
    * {@inheritdoc}
    */
@@ -99,7 +93,7 @@ class GlossaryViewTest extends JavascriptTestBase {
    * Test that the glossary also works on a language prefixed URL.
    */
   public function testGlossaryLanguagePrefix() {
-    $this->language = ConfigurableLanguage::createFromLangcode('nl')->save();
+    ConfigurableLanguage::createFromLangcode('nl')->save();
 
     $config = $this->config('language.negotiation');
     $config->set('url.prefixes', ['en' => 'en', 'nl' => 'nl'])