From 96e03e0b93bf75035887ce02880b832123e3c86d Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Fri, 6 Nov 2020 11:38:21 +1100 Subject: refactor(cli): refactor file_fetcher (#8245) --- cli/tests/035_cached_only_flag.out | 2 +- cli/tests/052_no_remote_flag.out | 2 +- cli/tests/error_004_missing_module.ts.out | 2 +- cli/tests/error_005_missing_dynamic_import.ts.out | 3 ++- cli/tests/error_006_import_ext_failure.ts.out | 2 +- cli/tests/error_013_missing_script.out | 2 +- cli/tests/error_015_dynamic_import_permissions.out | 1 + cli/tests/type_directives_js_main.js.out | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) (limited to 'cli/tests') diff --git a/cli/tests/035_cached_only_flag.out b/cli/tests/035_cached_only_flag.out index 97de547e0..0c4992799 100644 --- a/cli/tests/035_cached_only_flag.out +++ b/cli/tests/035_cached_only_flag.out @@ -1 +1 @@ -error: Cannot find module "http://127.0.0.1:4545/cli/tests/019_media_types.ts" in cache, --cached-only is specified +error: Specifier not found in cache: "http://127.0.0.1:4545/cli/tests/019_media_types.ts", --cached-only is specified. diff --git a/cli/tests/052_no_remote_flag.out b/cli/tests/052_no_remote_flag.out index e4d11592e..9fefc4b92 100644 --- a/cli/tests/052_no_remote_flag.out +++ b/cli/tests/052_no_remote_flag.out @@ -1 +1 @@ -error: Cannot resolve module "http://127.0.0.1:4545/cli/tests/019_media_types.ts" +error: A remote specifier was requested: "http://127.0.0.1:4545/cli/tests/019_media_types.ts", but --no-remote is specified. diff --git a/cli/tests/error_004_missing_module.ts.out b/cli/tests/error_004_missing_module.ts.out index 68032afb4..1b3dd534f 100644 --- a/cli/tests/error_004_missing_module.ts.out +++ b/cli/tests/error_004_missing_module.ts.out @@ -1,2 +1,2 @@ -[WILDCARD]error: Cannot resolve module "file:///[WILDCARD]cli/tests/bad-module.ts" from "file:///[WILDCARD]cli/tests/error_004_missing_module.ts" +[WILDCARD]error: Cannot resolve module "file:///[WILDCARD]cli/tests/bad-module.ts" from "file:///[WILDCARD]cli/tests/error_004_missing_module.ts". at file:///[WILDCARD]cli/tests/error_004_missing_module.ts:2:0 diff --git a/cli/tests/error_005_missing_dynamic_import.ts.out b/cli/tests/error_005_missing_dynamic_import.ts.out index 346e8cd6f..79c61e7c8 100644 --- a/cli/tests/error_005_missing_dynamic_import.ts.out +++ b/cli/tests/error_005_missing_dynamic_import.ts.out @@ -1 +1,2 @@ -error: Cannot resolve module "[WILDCARD]/bad-module.ts" from "[WILDCARD]/error_005_missing_dynamic_import.ts" +error: Cannot resolve module "[WILDCARD]/bad-module.ts" from "[WILDCARD]/error_005_missing_dynamic_import.ts". + at file:///[WILDCARD]/error_005_missing_dynamic_import.ts:3:26 diff --git a/cli/tests/error_006_import_ext_failure.ts.out b/cli/tests/error_006_import_ext_failure.ts.out index 01f8af07e..601e527cf 100644 --- a/cli/tests/error_006_import_ext_failure.ts.out +++ b/cli/tests/error_006_import_ext_failure.ts.out @@ -1,2 +1,2 @@ -[WILDCARD]error: Cannot resolve module "[WILDCARD]/non-existent" from "[WILDCARD]/error_006_import_ext_failure.ts" +[WILDCARD]error: Cannot resolve module "[WILDCARD]/non-existent" from "[WILDCARD]/error_006_import_ext_failure.ts". at file:///[WILDCARD]cli/tests/error_006_import_ext_failure.ts:1:0 diff --git a/cli/tests/error_013_missing_script.out b/cli/tests/error_013_missing_script.out index 35aaec9be..d1c257bdb 100644 --- a/cli/tests/error_013_missing_script.out +++ b/cli/tests/error_013_missing_script.out @@ -1 +1 @@ -error: Cannot resolve module "[WILDCARD]missing_file_name" +error: Cannot resolve module "[WILDCARD]missing_file_name". diff --git a/cli/tests/error_015_dynamic_import_permissions.out b/cli/tests/error_015_dynamic_import_permissions.out index 9b47ebe9d..b385da0d4 100644 --- a/cli/tests/error_015_dynamic_import_permissions.out +++ b/cli/tests/error_015_dynamic_import_permissions.out @@ -1 +1,2 @@ error: network access to "http://localhost:4545/cli/tests/subdir/mod4.js", run again with the --allow-net flag + at file:///[WILDCARD]cli/tests/error_015_dynamic_import_permissions.js:[WILDCARD] diff --git a/cli/tests/type_directives_js_main.js.out b/cli/tests/type_directives_js_main.js.out index 9503e5273..13decaa78 100644 --- a/cli/tests/type_directives_js_main.js.out +++ b/cli/tests/type_directives_js_main.js.out @@ -1,3 +1,3 @@ [WILDCARD] -DEBUG RS - [WILDCARD] - fetch_source_file specifier: file:[WILDCARD]cli/tests/subdir/type_reference.d.ts [WILDCARD] +DEBUG RS - [WILDCARD] - FileFetcher::fetch() - specifier: file:///[WILDCARD]cli/tests/subdir/type_reference.d.ts [WILDCARD] -- cgit v1.2.3