Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / locale / tests / src / Functional / LocaleJavascriptTranslationTest.php

diff --git a/web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
similarity index 92%
rename from web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
rename to web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
index fe99ce2f37c424c3680c17dd542616cf4d72ce98..bbb825832b77324c3f9e1d4ecbf8e64419ce2c6b 100644 (file)
--- a/web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Component\Utility\SafeMarkup;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\Component\Utility\SafeMarkup;
  *
  * @group locale
  */
-class LocaleJavascriptTranslationTest extends WebTestBase {
+class LocaleJavascriptTranslationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -21,7 +21,7 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
   public static $modules = ['locale', 'locale_test'];
 
   public function testFileParsing() {
-    $filename = __DIR__ . '/../../tests/locale_test.js';
+    $filename = __DIR__ . '/../../locale_test.js';
 
     // Parse the file to look for source strings.
     _locale_parse_js_file($filename);
@@ -138,8 +138,9 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
     $js_translation_files = \Drupal::state()->get('locale.translation.javascript');
     $js_filename = $prefix . '_' . $js_translation_files[$prefix] . '.js';
 
+    $content = $this->getSession()->getPage()->getContent();
     // Assert translations JS is included before drupal.js.
-    $this->assertTrue(strpos($this->content, $js_filename) < strpos($this->content, 'core/misc/drupal.js'), 'Translations are included before Drupal.t.');
+    $this->assertTrue(strpos($content, $js_filename) < strpos($content, 'core/misc/drupal.js'), 'Translations are included before Drupal.t.');
   }
 
 }