diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-29 12:50:43 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-29 12:50:43 -0700 |
| commit | 7ad0db1015aad9ae457290b5b31867f990643de4 (patch) | |
| tree | 268f4f601fa77a535679fa73c6d3a12f7b72edbc /modules/simpletest/drupal_web_test_case.php | |
| parent | 33e476a1fdabb335e2bc8d9869d5a770460b3b55 (diff) | |
| download | brdo-7ad0db1015aad9ae457290b5b31867f990643de4.tar.gz brdo-7ad0db1015aad9ae457290b5b31867f990643de4.tar.bz2 | |
Issue #561858 follow-up by effulgentsia, sun: Add tests for AJAX framework lazy-load feature.
Diffstat (limited to 'modules/simpletest/drupal_web_test_case.php')
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 2b23a3bb4..04f66ec09 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -1968,6 +1968,16 @@ class DrupalWebTestCase extends DrupalTestCase { $id = (string) $element['id']; $extra_post .= '&' . urlencode('ajax_html_ids[]') . '=' . urlencode($id); } + if (isset($drupal_settings['ajaxPageState'])) { + $extra_post .= '&' . urlencode('ajax_page_state[theme]') . '=' . urlencode($drupal_settings['ajaxPageState']['theme']); + $extra_post .= '&' . urlencode('ajax_page_state[theme_token]') . '=' . urlencode($drupal_settings['ajaxPageState']['theme_token']); + foreach ($drupal_settings['ajaxPageState']['css'] as $key => $value) { + $extra_post .= '&' . urlencode("ajax_page_state[css][$key]") . '=1'; + } + foreach ($drupal_settings['ajaxPageState']['js'] as $key => $value) { + $extra_post .= '&' . urlencode("ajax_page_state[js][$key]") . '=1'; + } + } // Unless a particular path is specified, use the one specified by the // Ajax settings, or else 'system/ajax'. @@ -1992,7 +2002,7 @@ class DrupalWebTestCase extends DrupalTestCase { foreach ($return as $command) { switch ($command['command']) { case 'settings': - $drupal_settings = array_merge_recursive($drupal_settings, $command['settings']); + $drupal_settings = drupal_array_merge_deep($drupal_settings, $command['settings']); break; case 'insert': |