summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli/tests/cafile_info.ts.out2
-rw-r--r--cli/tests/integration/mod.rs55
2 files changed, 26 insertions, 31 deletions
diff --git a/cli/tests/cafile_info.ts.out b/cli/tests/cafile_info.ts.out
index 62fc631f1..35575f8d6 100644
--- a/cli/tests/cafile_info.ts.out
+++ b/cli/tests/cafile_info.ts.out
@@ -1,6 +1,6 @@
local: [WILDCARD]https[WILDCARD]localhost_PORT5545[WILDCARD]
type: TypeScript
-deps: 8 unique (total [WILDCARD])
+dependencies: 8 unique (total [WILDCARD])
https://localhost:5545/cli/tests/cafile_info.ts ([WILDCARD])
├── https://localhost:5545/cli/tests/subdir/mt_application_ecmascript.j2.js ([WILDCARD])
diff --git a/cli/tests/integration/mod.rs b/cli/tests/integration/mod.rs
index ee9c195f3..b8917fc91 100644
--- a/cli/tests/integration/mod.rs
+++ b/cli/tests/integration/mod.rs
@@ -447,32 +447,31 @@ fn broken_stdout() {
assert!(!stderr.contains("panic"));
}
-// TODO(lucacasonato): reenable these tests once we figure out what is wrong with cafile tests
-// itest!(cafile_url_imports {
-// args: "run --quiet --reload --cert tls/RootCA.pem cafile_url_imports.ts",
-// output: "cafile_url_imports.ts.out",
-// http_server: true,
-// });
-
-// itest!(cafile_ts_fetch {
-// args:
-// "run --quiet --reload --allow-net --cert tls/RootCA.pem cafile_ts_fetch.ts",
-// output: "cafile_ts_fetch.ts.out",
-// http_server: true,
-// });
-
-// itest!(cafile_eval {
-// args: "eval --cert tls/RootCA.pem fetch('https://localhost:5545/cli/tests/cafile_ts_fetch.ts.out').then(r=>r.text()).then(t=>console.log(t.trimEnd()))",
-// output: "cafile_ts_fetch.ts.out",
-// http_server: true,
-// });
-
-// itest!(cafile_info {
-// args:
-// "info --quiet --cert tls/RootCA.pem https://localhost:5545/cli/tests/cafile_info.ts",
-// output: "cafile_info.ts.out",
-// http_server: true,
-// });
+itest!(cafile_url_imports {
+ args: "run --quiet --reload --cert tls/RootCA.pem cafile_url_imports.ts",
+ output: "cafile_url_imports.ts.out",
+ http_server: true,
+});
+
+itest!(cafile_ts_fetch {
+ args:
+ "run --quiet --reload --allow-net --cert tls/RootCA.pem cafile_ts_fetch.ts",
+ output: "cafile_ts_fetch.ts.out",
+ http_server: true,
+});
+
+itest!(cafile_eval {
+ args: "eval --cert tls/RootCA.pem fetch('https://localhost:5545/cli/tests/cafile_ts_fetch.ts.out').then(r=>r.text()).then(t=>console.log(t.trimEnd()))",
+ output: "cafile_ts_fetch.ts.out",
+ http_server: true,
+});
+
+itest!(cafile_info {
+ args:
+ "info --quiet --cert tls/RootCA.pem https://localhost:5545/cli/tests/cafile_info.ts",
+ output: "cafile_info.ts.out",
+ http_server: true,
+});
itest!(cafile_url_imports_unsafe_ssl {
args: "run --quiet --reload --unsafely-ignore-certificate-errors=localhost cafile_url_imports.ts",
@@ -502,7 +501,6 @@ itest!(localhost_unsafe_ssl {
});
#[test]
-#[ignore]
fn cafile_env_fetch() {
use deno_core::url::Url;
let _g = util::http_server();
@@ -523,7 +521,6 @@ fn cafile_env_fetch() {
}
#[test]
-#[ignore]
fn cafile_fetch() {
use deno_core::url::Url;
let _g = util::http_server();
@@ -547,7 +544,6 @@ fn cafile_fetch() {
}
#[test]
-#[ignore]
fn cafile_install_remote_module() {
let _g = util::http_server();
let temp_dir = TempDir::new().expect("tempdir fail");
@@ -590,7 +586,6 @@ fn cafile_install_remote_module() {
}
#[test]
-#[ignore]
fn cafile_bundle_remote_exports() {
let _g = util::http_server();