#345973 by aaron and Rob Loach: Move parameter on drupal_add_css/js to a 'type' instead, to clean up calling code.

1 files changed, 11 insertions, 3 deletions

diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 8f0ede290..78dc9f769 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -170,7 +170,7 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
   function setUp() {
     parent::setUp();
     // Reset drupal_add_css() before each test.
-    drupal_add_css(NULL, NULL, TRUE);
+    drupal_add_css(NULL, 'reset');
   }
 
   /**
@@ -190,6 +190,14 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
   }
 
   /**
+   * Makes sure that reseting the CSS empties the cache.
+   */
+  function testReset() {
+    drupal_add_css(NULL, 'reset');
+    $this->assertEqual(array(), drupal_add_css(), t('Resetting the CSS empties the cache.'));
+  }
+
+  /**
    * Tests rendering the stylesheets.
    */
   function testRenderFile() {
@@ -352,7 +360,7 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     variable_set('preprocess_js', 0);
 
     // Reset drupal_add_js() before each test.
-    drupal_add_js(NULL, NULL, TRUE);
+    drupal_add_js(NULL, 'reset');
   }
 
   function tearDown() {
@@ -404,7 +412,7 @@ class JavaScriptTestCase extends DrupalWebTestCase {
    */
   function testReset() {
     drupal_add_js('misc/collapse.js');
-    drupal_add_js(NULL, NULL, TRUE);
+    drupal_add_js(NULL, 'reset');
     $this->assertEqual(array(), drupal_add_js(), t('Resetting the JavaScript correctly empties the cache.'));
   }