Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

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

Issue 502533003: Revert of Add support for codepen to form_based_credentials_background (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ef292d6853bf1593851cf7e7766eb546d440c5cb..3ce0c864aa0cb371ff22b8cdf9839dc948daeeae 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,22 +95,17 @@
raise NotImplementedError()
def _LoginUsingMock(self, backend, login_page_url, email_element_id,
- password_element_id, form_element_id,
- already_logged_in_js): # pylint: disable=R0201
+ password_element_id): # 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', already_logged_in_js).WillReturn(False)
+ tab.ExpectCall('EvaluateJavaScript', _).WillReturn(False)
+ tab.ExpectCall('EvaluateJavaScript', _).WillReturn(True)
+ tab.ExpectCall('EvaluateJavaScript', _).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
@@ -123,10 +118,10 @@
tab.ExpectCall('ExecuteJavaScript', _).WhenCalled(VerifyPw)
def VerifySubmit(js):
- assert '.submit' in js or '.click' in js
+ assert '.submit' in js
tab.ExpectCall('ExecuteJavaScript', _).WhenCalled(VerifySubmit)
# Checking for form still up.
tab.ExpectCall('EvaluateJavaScript', _).WillReturn(False)
- backend.LoginNeeded(tab, ar, config)
+ backend.LoginNeeded(tab, config)

Powered by Google App Engine
This is Rietveld 408576698