diff options
author | tokiedokie <thetokiedokie@gmail.com> | 2020-09-15 13:26:57 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-15 06:26:57 +0200 |
commit | 04d347225776ef81282740a55b55a45419644b7f (patch) | |
tree | f8076b2f84c96112cb6599d475e7df4c5d470346 | |
parent | f457ff9157c845db08accd5905a2c1cbd7762b39 (diff) |
refactor(cli/tests): change std_path to root_path in std_tests() (#7438)
-rw-r--r-- | cli/tests/integration_tests.rs | 6 | ||||
-rw-r--r-- | std/node/process_test.ts | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index 62b1751b0..41e5c5d96 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -13,11 +13,10 @@ use tempfile::TempDir; #[test] fn std_tests() { let dir = TempDir::new().expect("tempdir fail"); - let std_path = util::root_path().join("std"); - let std_config = std_path.join("tsconfig_test.json"); + let std_config = util::root_path().join("std/tsconfig_test.json"); let status = util::deno_cmd() .env("DENO_DIR", dir.path()) - .current_dir(std_path) // TODO(ry) change this to root_path + .current_dir(util::root_path()) .arg("test") .arg("--unstable") .arg("--seed=86") // Some tests rely on specific random numbers. @@ -25,6 +24,7 @@ fn std_tests() { .arg("--config") .arg(std_config.to_str().unwrap()) // .arg("-Ldebug") + .arg("std/") .spawn() .unwrap() .wait() diff --git a/std/node/process_test.ts b/std/node/process_test.ts index d83a9dca7..4055dfd78 100644 --- a/std/node/process_test.ts +++ b/std/node/process_test.ts @@ -32,6 +32,8 @@ Deno.test({ fn() { assertEquals(process.cwd(), Deno.cwd()); + const currentDir = Deno.cwd(); // to unchange current directory after this test + const moduleDir = path.dirname(path.fromFileUrl(import.meta.url)); process.chdir(path.resolve(moduleDir, "..")); @@ -40,6 +42,7 @@ Deno.test({ assert(process.cwd().match(/\Wnode$/)); process.chdir(".."); assert(process.cwd().match(/\Wstd$/)); + process.chdir(currentDir); // to unchange current directory after this test }, }); |