Changeset 70 in tests

Timestamp:

11/02/2007 06:29:57 AM (19 years ago)

Author:

tellyworth

Message:

improve MockAction

File:

• wp-testlib/utils.php (modified) (2 diffs)

wp-testlib/utils.php

@@ -24 +24 @@
 class MockAction {
         var $events;
-
-        function MockAction() {
+        var $debug;
+
+        function MockAction($debug=0) {
                 $this->reset();
+                $this->debug = $debug;
         }
 
@@ -32 +34 @@
                 $this->events = array();
         }
+        
+        function current_filter() {
+                if (is_callable('current_filter'))
+                        return current_filter();
+                global $wp_actions;
+                return end($wp_actions);
+        }
 
         function action($arg) {
-                global $wp_current_action;
-
-                $args = func_get_args();
-                $this->events[] = array('action' => __FUNCTION__, 'tag'=>$wp_current_action, 'args'=>$args);
+if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+                $args = func_get_args();
+                $this->events[] = array('action' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
                 return $arg;
         }
 
         function action2($arg) {
-                global $wp_current_action;
-
-                $args = func_get_args();
-                $this->events[] = array('action' => __FUNCTION__, 'tag'=>$wp_current_action, 'args'=>$args);
+if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+
+                $args = func_get_args();
+                $this->events[] = array('action' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
                 return $arg;
         }
 
         function filter($arg) {
-                global $wp_current_filter;
-
-                $args = func_get_args();
-                $this->events[] = array('filter' => __FUNCTION__, 'tag'=>$wp_current_filter, 'args'=>$args);
+if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+
+                $args = func_get_args();
+                $this->events[] = array('filter' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
                 return $arg;
         }
 
         function filter2($arg) {
-                global $wp_current_filter;
-
-                $args = func_get_args();
-                $this->events[] = array('filter' => __FUNCTION__, 'tag'=>$wp_current_filter, 'args'=>$args);
+if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+
+                $args = func_get_args();
+                $this->events[] = array('filter' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
                 return $arg;
         }