Chromium Code Reviews

Unified Diff: tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py

Issue 485743002: Add support for codepen to form_based_credentials_background (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py
diff --git a/tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py b/tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py
index 3ce0c864aa0cb371ff22b8cdf9839dc948daeeae..ef292d6853bf1593851cf7e7766eb546d440c5cb 100644
--- a/tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py
+++ b/tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py
@@ -95,18 +95,23 @@ class FormBasedCredentialsBackendUnitTestBase(unittest.TestCase):
raise NotImplementedError()
def _LoginUsingMock(self, backend, login_page_url, email_element_id,
- password_element_id): # pylint: disable=R0201
+ password_element_id, form_element_id,
+ already_logged_in_js): # pylint: disable=R0201
tab = simple_mock.MockObject()
+ ar = simple_mock.MockObject()
config = {'username': 'blah',
'password': 'blargh'}
tab.ExpectCall('Navigate', login_page_url)
- tab.ExpectCall('EvaluateJavaScript', _).WillReturn(False)
- tab.ExpectCall('EvaluateJavaScript', _).WillReturn(True)
- tab.ExpectCall('EvaluateJavaScript', _).WillReturn(False)
+ tab.ExpectCall('EvaluateJavaScript', already_logged_in_js).WillReturn(False)
tab.ExpectCall('WaitForDocumentReadyStateToBeInteractiveOrBetter')
+ ar.ExpectCall('WaitForJavaScriptCondition',
+ '(document.querySelector("#%s") !== null) || (%s)' % (
+ form_element_id, already_logged_in_js), 60)
+ ar.ExpectCall('WaitForNavigate')
+
def VerifyEmail(js):
assert email_element_id in js
assert 'blah' in js
@@ -118,10 +123,10 @@ class FormBasedCredentialsBackendUnitTestBase(unittest.TestCase):
tab.ExpectCall('ExecuteJavaScript', _).WhenCalled(VerifyPw)
def VerifySubmit(js):
- assert '.submit' in js
+ assert '.submit' in js or '.click' in js
tab.ExpectCall('ExecuteJavaScript', _).WhenCalled(VerifySubmit)
# Checking for form still up.
tab.ExpectCall('EvaluateJavaScript', _).WillReturn(False)
- backend.LoginNeeded(tab, config)
+ backend.LoginNeeded(tab, ar, config)

Powered by Google App Engine