diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2021-06-22 01:45:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 01:45:41 +0200 |
| commit | 9105892ec8b454571c56883eace557eee25b3301 (patch) | |
| tree | 965d90e3a885c2f870f58eef921d8811a9a491b9 /cli/tools/test_runner.rs | |
| parent | a5eb2dfc93afc2899ed6e1ad2b3e029157889f7c (diff) | |
refactor: unify JavaScript script execution method (#11043)
This commit renames "JsRuntime::execute" to "JsRuntime::execute_script". Additionally
same renames were applied to methods on "deno_runtime::Worker" and
"deno_runtime::WebWorker".
A new macro was added to "deno_core" called "located_script_name" which
returns the name of Rust file alongside line no and col no of that call site.
This macro is useful in combination with "JsRuntime::execute_script"
and allows to provide accurate place where "one-off" JavaScript scripts
are executed for internal runtime functions.
Co-authored-by: Nayeem Rahman <nayeemrmn99@gmail.com>
Diffstat (limited to 'cli/tools/test_runner.rs')
| -rw-r--r-- | cli/tools/test_runner.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cli/tools/test_runner.rs b/cli/tools/test_runner.rs index 24bea3ff8..96b101fa3 100644 --- a/cli/tools/test_runner.rs +++ b/cli/tools/test_runner.rs @@ -16,6 +16,7 @@ use deno_core::futures::future; use deno_core::futures::stream; use deno_core::futures::FutureExt; use deno_core::futures::StreamExt; +use deno_core::located_script_name; use deno_core::serde_json::json; use deno_core::url::Url; use deno_core::ModuleSpecifier; @@ -302,7 +303,10 @@ pub async fn run_test_file( let execute_result = worker.execute_module(&main_module).await; execute_result?; - worker.execute("window.dispatchEvent(new Event('load'))")?; + worker.execute_script( + &located_script_name!(), + "window.dispatchEvent(new Event('load'))", + )?; let execute_result = worker.execute_module(&test_module).await; execute_result?; @@ -310,7 +314,10 @@ pub async fn run_test_file( worker .run_event_loop(maybe_coverage_collector.is_none()) .await?; - worker.execute("window.dispatchEvent(new Event('unload'))")?; + worker.execute_script( + &located_script_name!(), + "window.dispatchEvent(new Event('unload'))", + )?; if let Some(coverage_collector) = maybe_coverage_collector.as_mut() { worker |