summaryrefslogtreecommitdiff
path: root/modules/simpletest/tests/ajax.test
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-07-30 02:47:28 +0000
committerDries Buytaert <dries@buytaert.net>2010-07-30 02:47:28 +0000
commit37c3c7ec7aff7fad84b3839ac3fa5437b7b256b2 (patch)
tree97fe1cd55f6501efaaa21129abd043fc94242d8e /modules/simpletest/tests/ajax.test
parent4f2d69698c849e4e20ad5ae92b0652654a88f840 (diff)
downloadbrdo-37c3c7ec7aff7fad84b3839ac3fa5437b7b256b2.tar.gz
brdo-37c3c7ec7aff7fad84b3839ac3fa5437b7b256b2.tar.bz2
- Patch #769226 by Owen Barton, alanburke, sun: fixed JS/CSS preprocess should default to FALSE.
Diffstat (limited to 'modules/simpletest/tests/ajax.test')
-rw-r--r--modules/simpletest/tests/ajax.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/simpletest/tests/ajax.test b/modules/simpletest/tests/ajax.test
index 97cd2f5d2..91572bda0 100644
--- a/modules/simpletest/tests/ajax.test
+++ b/modules/simpletest/tests/ajax.test
@@ -53,7 +53,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
* Test behavior of ajax_render_error().
*/
function testAJAXRenderError() {
- $result = $this->drupalGetAJAX('ajax-test/render-error');
+ $result = $this->discardSettings($this->drupalGetAJAX('ajax-test/render-error'));
// Verify default error message.
$this->assertEqual($result[0]['command'], 'alert', t('ajax_render_error() invokes alert command.'));
$this->assertEqual($result[0]['text'], t('An error occurred while handling the request: The server received invalid input.'), t('Default error message is output.'));
@@ -61,7 +61,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
$edit = array(
'message' => 'Custom error message.',
);
- $result = $this->drupalGetAJAX('ajax-test/render-error', array('query' => $edit));
+ $result = $this->discardSettings($this->drupalGetAJAX('ajax-test/render-error', array('query' => $edit)));
$this->assertEqual($result[0]['text'], $edit['message'], t('Custom error message is output.'));
}
}