doing some python magic to make switch_to* work on event firing webdriver

Fixes #478

Author: lukeis

Diff for: py/selenium/webdriver/support/event_firing_webdriver.py

@@ -65,6 +65,7 @@ def after_navigate_to(self, url, driver):
         if not isinstance(event_listener, AbstractEventListener):
             raise WebDriverException("Event listener must be a subclass of AbstractEventListener")
         self._driver = driver
+        self._driver._wrap_value = self._wrap_value
         self._listener = event_listener
 
     @property
@@ -168,7 +169,12 @@ def _unwrap_element_args(self, args):
             return [self._unwrap_element_args(item) for item in args]
         else:
             return args
-        
+
+    def _wrap_value(self, value):
+        if isinstance(value, EventFiringWebElement):
+            return WebDriver._wrap_value(self._driver, value.wrapped_element)
+        return WebDriver._wrap_value(self._driver, value)
+
     def __setattr__(self, item, value):
         if item.startswith("_") or not hasattr(self._driver, item):
             object.__setattr__(self, item, value)

Diff for: py/test/selenium/webdriver/support/event_firing_webdriver_tests.py

@@ -163,6 +163,13 @@ def test_should_unwrap_element_args_when_calling_scripts(self):
             "arguments[0]['flibble'] = arguments[0].getAttribute('id'); return arguments[0]['flibble']",
             button)
         self.assertEqual("plainButton", value)
+    
+    def test_should_unwrap_element_args_when_switching_frames(self):
+        ef_driver = EventFiringWebDriver(self.driver, AbstractEventListener())
+        ef_driver.get(self._pageURL("iframes"))
+        frame = ef_driver.find_element_by_id("iframe1")
+        ef_driver.switch_to.frame(frame)
+        self.assertEqual("click me!", ef_driver.find_element_by_id("imageButton").get_attribute("alt"))
 
     def test_should_be_able_to_access_wrapped_instance_from_event_calls(self):
         driver = self.driver