tools/telemetry/telemetry/page/actions/javascript_click_unittest.py - Issue 186593007: Remove href_change and navigate from wait action

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/page/actions/javascript_click_unittest.py

Issue 186593007: Remove href_change and navigate from wait action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 9 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

« no previous file with comments | « tools/telemetry/telemetry/page/actions/javascript_click.py ('k') | tools/telemetry/telemetry/page/actions/js_collect_garbage.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/page/actions/javascript_click_unittest.py

diff --git a/tools/telemetry/telemetry/page/actions/javascript_click_unittest.py b/tools/telemetry/telemetry/page/actions/javascript_click_unittest.py

index ccb1117949cfa0090bfc9c6fff23fa79fbd952ee..771730d2a6577c85ee1ae9e0a620f4347b2df0f9 100644

--- a/tools/telemetry/telemetry/page/actions/javascript_click_unittest.py

+++ b/tools/telemetry/telemetry/page/actions/javascript_click_unittest.py

@@ -3,7 +3,7 @@

# found in the LICENSE file.

from telemetry.page.actions import javascript_click

-from telemetry.page.actions import wait

+from telemetry.page.actions import wait_until

from telemetry.unittest import tab_test_case

@@ -17,8 +17,8 @@ class ClickElementActionTest(tab_test_case.TabTestCase):

data = {'selector': 'a[id="clickme"]'}

i = javascript_click.ClickElementAction(data)

data = {'condition': 'href_change'}

- j = wait.WaitAction(data)

- j.RunAction(None, self._tab, i)

+ j = wait_until.WaitUntil(i, data)

+ j.RunActionAndWait(None, self._tab)

self.assertEquals(

self._tab.EvaluateJavaScript('document.location.pathname;'),

@@ -33,8 +33,8 @@ class ClickElementActionTest(tab_test_case.TabTestCase):

data = {'selector': 'a[id=\'clickme\']'}

i = javascript_click.ClickElementAction(data)

data = {'condition': 'href_change'}

- j = wait.WaitAction(data)

- j.RunAction(None, self._tab, i)

+ j = wait_until.WaitUntil(i, data)

+ j.RunActionAndWait(None, self._tab)

self.assertEquals(

self._tab.EvaluateJavaScript('document.location.pathname;'),

@@ -49,8 +49,8 @@ class ClickElementActionTest(tab_test_case.TabTestCase):

data = {'text': 'Click me'}

i = javascript_click.ClickElementAction(data)

data = {'condition': 'href_change'}

- j = wait.WaitAction(data)

- j.RunAction(None, self._tab, i)

+ j = wait_until.WaitUntil(i, data)

+ j.RunActionAndWait(None, self._tab)

self.assertEquals(

self._tab.EvaluateJavaScript('document.location.pathname;'),

@@ -65,8 +65,8 @@ class ClickElementActionTest(tab_test_case.TabTestCase):

data = {'xpath': '//a[@id="clickme"]'}

i = javascript_click.ClickElementAction(data)

data = {'condition': 'href_change'}

- j = wait.WaitAction(data)

- j.RunAction(None, self._tab, i)

+ j = wait_until.WaitUntil(i, data)

+ j.RunActionAndWait(None, self._tab)

self.assertEquals(

self._tab.EvaluateJavaScript('document.location.pathname;'),