diff options
Diffstat (limited to 'chrome/test/functional/execute_javascript.py')
| -rw-r--r-- | chrome/test/functional/execute_javascript.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/test/functional/execute_javascript.py b/chrome/test/functional/execute_javascript.py index af7a9d0..b935a51 100644 --- a/chrome/test/functional/execute_javascript.py +++ b/chrome/test/functional/execute_javascript.py @@ -46,28 +46,26 @@ class ExecuteJavascriptTest(PyUITest): msg='Extension was disabled by default') # Get the background page's view. - info = self.GetBrowserInfo()['extension_views'] - view = [x for x in info if - x['extension_id'] == ext_id and - x['view_type'] == 'EXTENSION_BACKGROUND_PAGE'] - self.assertEqual(1, len(view), - msg='problematic background view: view = %s.' % view) - background_view = view[0] + background_view = self.WaitUntilExtensionViewLoaded( + view_type='EXTENSION_BACKGROUND_PAGE') + self.assertTrue(background_view, + msg='problematic background view: views = %s.' % + self.GetBrowserInfo()['extension_views']) # Get values from background page's DOM v = self.ExecuteJavascriptInRenderView( 'window.domAutomationController.send(' - 'document.getElementById("myinput").nodeName)', background_view['view']) + 'document.getElementById("myinput").nodeName)', background_view) self.assertEqual(v, 'INPUT', msg='Incorrect value returned (v = %s).' % v) v = self.ExecuteJavascriptInRenderView( - 'window.domAutomationController.send(bool_var)', background_view['view']) + 'window.domAutomationController.send(bool_var)', background_view) self.assertEqual(v, True, msg='Incorrect value returned (v = %s).' % v) v = self.ExecuteJavascriptInRenderView( - 'window.domAutomationController.send(int_var)', background_view['view']) + 'window.domAutomationController.send(int_var)', background_view) self.assertEqual(v, 42, msg='Incorrect value returned (v = %s).' % v) v = self.ExecuteJavascriptInRenderView( - 'window.domAutomationController.send(str_var)', background_view['view']) + 'window.domAutomationController.send(str_var)', background_view) self.assertEqual(v, 'foo', msg='Incorrect value returned (v = %s).' % v) |