Index: tools/perf/page_sets/calendar_forward_backward.py |
diff --git a/tools/perf/page_sets/calendar_forward_backward.py b/tools/perf/page_sets/calendar_forward_backward.py |
index f4ca483ef41e3f2a0499d1a2fbfcac4b62e07ead..609b59cf6810601e26f800c6714774ddcf07387e 100644 |
--- a/tools/perf/page_sets/calendar_forward_backward.py |
+++ b/tools/perf/page_sets/calendar_forward_backward.py |
@@ -23,15 +23,8 @@ class CalendarForwardBackwardPage(page_module.Page): |
def RunNavigateSteps(self, action_runner): |
action_runner.NavigateToPage(self) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navForward"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navForward"]') |
action_runner.ExecuteJavaScript(''' |
(function() { |
var elem = document.createElement('meta'); |
@@ -45,106 +38,50 @@ class CalendarForwardBackwardPage(page_module.Page): |
{ |
'selector': 'div[class~="navForward"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navForward"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navForward"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navForward"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navForward"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navForward"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navForward"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navForward"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navForward"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navForward"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navBack"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navBack"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navBack"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navBack"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navBack"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navBack"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navBack"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navBack"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navBack"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navBack"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navBack"]') |
action_runner.RunAction(ClickElementAction( |
{ |
'selector': 'div[class~="navBack"]' |
})) |
- action_runner.RunAction(WaitAction( |
- { |
- 'seconds': 2 |
- })) |
- action_runner.RunAction(WaitAction( |
- { |
- 'condition': 'element', |
- 'selector': 'div[class~="navForward"]' |
- })) |
+ action_runner.Wait(2) |
+ action_runner.WaitForElement('div[class~="navForward"]') |
class CalendarForwardBackwardPageSet(page_set_module.PageSet): |