diff options
| author | frankf@google.com <frankf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 01:35:42 +0000 |
|---|---|---|
| committer | frankf@google.com <frankf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 01:35:42 +0000 |
| commit | 6def728cea716c7990d4d1f891a977eece44af28 (patch) | |
| tree | 00e8e1b7f2f0cc2a37f31005fb69aadca60a72f9 /chrome/test/functional/execute_javascript.py | |
| parent | 047eaca7d28de4a2f5c224ea4c920996c8f90650 (diff) | |
| download | chromium_src-6def728cea716c7990d4d1f891a977eece44af28.zip chromium_src-6def728cea716c7990d4d1f891a977eece44af28.tar.gz chromium_src-6def728cea716c7990d4d1f891a977eece44af28.tar.bz2 | |
Create convenience methods to automating the FileBrowser.
Fix the timing issue with extension background loading.
BUG=chromium-os:17903, chromium:94683
TEST=
Review URL: http://codereview.chromium.org/7817014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101218 0039d316-1c4b-4281-b951-d872f2087c98
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) |