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

Unified Diff: telemetry/telemetry/internal/actions/load_media_unittest.py

Issue 2559503002: [Telemetry] Fix JavaScript interpolation in telemetry actions (Closed)
Patch Set: inline js literals Created 4 years 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 | « telemetry/telemetry/internal/actions/load_media.py ('k') | telemetry/telemetry/internal/actions/loop.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/internal/actions/load_media_unittest.py
diff --git a/telemetry/telemetry/internal/actions/load_media_unittest.py b/telemetry/telemetry/internal/actions/load_media_unittest.py
index 5915e7d0d3123385dffa335a9b9fb39fea60b5b7..cdb7719e3622443536af320117ed01258a3af884 100644
--- a/telemetry/telemetry/internal/actions/load_media_unittest.py
+++ b/telemetry/telemetry/internal/actions/load_media_unittest.py
@@ -5,6 +5,7 @@
from telemetry import decorators
from telemetry.internal.actions.load_media import LoadMediaAction
from telemetry.testing import tab_test_case
+from telemetry.util import js_template
import py_utils
@@ -16,9 +17,11 @@ class LoadMediaActionTest(tab_test_case.TabTestCase):
self.Navigate('video_test.html')
def eventFired(self, selector, event):
- # TODO(catapult:#3028): Fix interpolation of JavaScript values.
- return self._tab.EvaluateJavaScript(
- 'window.__hasEventCompleted("%s", "%s");' % (selector, event))
+ # TODO(catapult:#3028): Render in JavaScript method when supported by API.
+ code = js_template.Render(
+ 'window.__hasEventCompleted({{ selector }}, {{ event }});',
+ selector=selector, event=event)
+ return self._tab.EvaluateJavaScript(code)
@decorators.Disabled('linux', # crbug.com/418577
'chromeos') # crbug.com/632802
« no previous file with comments | « telemetry/telemetry/internal/actions/load_media.py ('k') | telemetry/telemetry/internal/actions/loop.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698