diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index 72bac19d33ff5edc4c2dea561fe67e0ec9f98e53..7f51130c208612d640ea63af9197bd6b73d71532 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -141,7 +141,7 @@ function testLoading() {
}
protected function getThingsToCheck() {
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
return array(
// JavaScript settings.
$settings,
diff --git a/core/modules/comment/src/Tests/CommentCSSTest.php b/core/modules/comment/src/Tests/CommentCSSTest.php
index a3d8a61a7b014c1194de9930a998b62e1d115d45..770502b2664fbe50b2a4cfb1279e9631b2569b6b 100644
--- a/core/modules/comment/src/Tests/CommentCSSTest.php
+++ b/core/modules/comment/src/Tests/CommentCSSTest.php
@@ -79,7 +79,7 @@ function testCommentClasses() {
}
// Request the node with the comment.
$this->drupalGet('node/' . $node->id());
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
// Verify the data-history-node-id attribute, which is necessary for the
// by-viewer class and the "new" indicator, see below.
diff --git a/core/modules/editor/src/Tests/EditorLoadingTest.php b/core/modules/editor/src/Tests/EditorLoadingTest.php
index 387e6e659701fe38282b5f74f17091367469dd88..910f6faab9dcd0048b5f1f692e4fbaf48d1c1d87 100644
--- a/core/modules/editor/src/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/src/Tests/EditorLoadingTest.php
@@ -154,7 +154,7 @@ public function testLoading() {
}
protected function getThingsToCheck() {
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
return array(
// JavaScript settings.
$settings,
diff --git a/core/modules/history/src/Tests/HistoryTest.php b/core/modules/history/src/Tests/HistoryTest.php
index f0f05b8b3d5d1e9f4e7407820d4ec1749e1bf9e9..3acd3c424398afde32c25a1b2513f9a00e9faa50 100644
--- a/core/modules/history/src/Tests/HistoryTest.php
+++ b/core/modules/history/src/Tests/HistoryTest.php
@@ -118,7 +118,7 @@ function testHistory() {
// View the node.
$this->drupalGet('node/' . $nid);
// JavaScript present to record the node read.
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
$this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/history/js/history.js']), 'drupal.history library is present.');
$this->assertRaw('Drupal.history.markAsRead(' . $nid . ')', 'History module JavaScript API call to mark node as read present on page.');
diff --git a/core/modules/language/src/Tests/LanguageSwitchingTest.php b/core/modules/language/src/Tests/LanguageSwitchingTest.php
index dfd8d2e937d7890df9b05f769a01fc095081a844..16fa5acd67d4fd4f2fdbaed5bfbd1992ee62726b 100644
--- a/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/src/Tests/LanguageSwitchingTest.php
@@ -102,7 +102,7 @@ protected function doTestLanguageBlockAuthenticated($block_label) {
1 => array('hreflang' => 'fr', 'data-drupal-link-system-path' => 'user/2'),
);
$this->assertIdentical($anchors, $expected_anchors, 'The anchors have the correct attributes that will allow the drupal.active-link library to mark them as active.');
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
$this->assertIdentical($settings['path']['currentPath'], 'user/2', 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
$this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
$this->assertIdentical($settings['path']['currentLanguage'], 'en', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
@@ -205,7 +205,7 @@ protected function doTestLanguageLinkActiveClassAuthenticated() {
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Verify that drupalSettings contains the correct values.
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
$this->assertIdentical($settings['path']['currentPath'], $path, 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
$this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
$this->assertIdentical($settings['path']['currentLanguage'], 'en', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
@@ -230,7 +230,7 @@ protected function doTestLanguageLinkActiveClassAuthenticated() {
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Verify that drupalSettings contains the correct values.
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
$this->assertIdentical($settings['path']['currentPath'], $path, 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
$this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
$this->assertIdentical($settings['path']['currentLanguage'], 'fr', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
index a20663d8702c79f709bfb87ba3109bad093fb9eb..ed74ed288784aefb760185402ad39008db541a55 100644
--- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
@@ -73,7 +73,7 @@ public function testUserWithoutPermission() {
$this->drupalGet('node/1');
// Library and in-place editors.
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
$this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/quickedit.js']), 'Quick Edit library not loaded.');
$this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/editors/formEditor.js']), "'form' in-place editor not loaded.");
@@ -125,7 +125,7 @@ public function testUserWithPermission() {
$this->drupalGet('node/1');
// Library and in-place editors.
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
$this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/quickedit.js']), 'Quick Edit library loaded.');
$this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/editors/formEditor.js']), "'form' in-place editor not loaded.");
diff --git a/core/modules/system/src/Tests/Ajax/FrameworkTest.php b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
index 0928c2ac5b3dd5950eced4d72bd5f3838fbaf321..d52e243e2470a24c3bf1a4e3a3a76f794c12347a 100644
--- a/core/modules/system/src/Tests/Ajax/FrameworkTest.php
+++ b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
@@ -138,7 +138,7 @@ public function testLazyLoad() {
// Get the base page.
$this->drupalGet('ajax_forms_test_lazy_load_form');
- $original_settings = $this->drupalGetSettings();
+ $original_settings = $this->getDrupalSettings();
$original_css = $original_settings['ajaxPageState']['css'];
$original_js = $original_settings['ajaxPageState']['js'];
@@ -150,7 +150,7 @@ public function testLazyLoad() {
// Submit the AJAX request without triggering files getting added.
$commands = $this->drupalPostAjaxForm(NULL, array('add_files' => FALSE), array('op' => t('Submit')));
- $new_settings = $this->drupalGetSettings();
+ $new_settings = $this->getDrupalSettings();
$new_css = $new_settings['ajaxPageState']['css'];
$new_js = $new_settings['ajaxPageState']['js'];
@@ -175,7 +175,7 @@ public function testLazyLoad() {
// Submit the AJAX request and trigger adding files.
$commands = $this->drupalPostAjaxForm(NULL, array('add_files' => TRUE), array('op' => t('Submit')));
- $new_settings = $this->drupalGetSettings();
+ $new_settings = $this->getDrupalSettings();
$new_css = $new_settings['ajaxPageState']['css'];
$new_js = $new_settings['ajaxPageState']['js'];
diff --git a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
index c537c2dcf4be994dbf766511d27f9b3723567941..d0c0685042ccbab60be3fdb0ddfa15bbea70df3b 100644
--- a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
+++ b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
@@ -491,7 +491,7 @@ function testLanguageSwitching() {
* The hash value from the admin menu subtrees route path.
*/
private function getSubtreesHash() {
- $settings = $this->drupalGetSettings();
+ $settings = $this->getDrupalSettings();
// The toolbar module defines a route '/toolbar/subtrees/{hash}' that
// returns JSON for the rendered subtrees. This hash is provided to the
// client in drupalSettings.