Unverified Commit 875ddea1 authored by Justin Ridgewell's avatar Justin Ridgewell Committed by GitHub

next-swc: Switch to testing::fixture (#47183)

The old `test_generator::test_resources` could only find resources relative to the project root, and not relative to the test file. Because of the new nextpack directory structure, this causes all kinds of headaches between running in nextpack and running in turbo (`next.js/packages/next-swc` vs `nextpack/next.js/packages/next-swc`).
parent 6a603464
[env] [env]
CARGO_WORKSPACE_DIR = { value = "", relative = true } CARGO_WORKSPACE_DIR = { value = "", relative = true }
PNPM_WORKSPACE_DIR = { value = "../../", relative = true }
[build] [build]
...@@ -30,5 +29,5 @@ rustflags = [ ...@@ -30,5 +29,5 @@ rustflags = [
"--cfg", "--cfg",
"tokio_unstable", "tokio_unstable",
"-Csymbol-mangling-version=v0", "-Csymbol-mangling-version=v0",
"-Aclippy::too_many_arguments" "-Aclippy::too_many_arguments",
] ]
This diff is collapsed.
...@@ -141,7 +141,6 @@ serde_qs = "0.11.0" ...@@ -141,7 +141,6 @@ serde_qs = "0.11.0"
serde_yaml = "0.9.17" serde_yaml = "0.9.17"
syn = "1.0.107" syn = "1.0.107"
tempfile = "3.3.0" tempfile = "3.3.0"
test-generator = "0.3.1"
thiserror = "1.0.38" thiserror = "1.0.38"
tiny-gradient = "0.1.0" tiny-gradient = "0.1.0"
tokio = "1.25.0" tokio = "1.25.0"
......
...@@ -37,7 +37,7 @@ rand = { workspace = true } ...@@ -37,7 +37,7 @@ rand = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
test-generator = { workspace = true } testing = { workspace = true }
tokio = { workspace = true, features = ["full"] } tokio = { workspace = true, features = ["full"] }
# For matching on errors from chromiumoxide. Keep in # For matching on errors from chromiumoxide. Keep in
# sync with chromiumoxide's tungstenite requirement. # sync with chromiumoxide's tungstenite requirement.
......
#![feature(min_specialization)] #![feature(min_specialization)]
#![cfg(test)] #![cfg(test)]
extern crate test_generator;
use dunce::canonicalize; use dunce::canonicalize;
use regex::{Captures, Regex, Replacer}; use regex::{Captures, Regex, Replacer};
...@@ -31,7 +30,6 @@ use lazy_static::lazy_static; ...@@ -31,7 +30,6 @@ use lazy_static::lazy_static;
use next_dev::{EntryRequest, NextDevServerBuilder}; use next_dev::{EntryRequest, NextDevServerBuilder};
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use serde::Deserialize; use serde::Deserialize;
use test_generator::test_resources;
use tokio::{ use tokio::{
net::TcpSocket, net::TcpSocket,
sync::mpsc::{unbounded_channel, UnboundedSender}, sync::mpsc::{unbounded_channel, UnboundedSender},
...@@ -98,8 +96,8 @@ fn run_async_test<'a, T>(future: impl Future<Output = T> + Send + 'a) -> T { ...@@ -98,8 +96,8 @@ fn run_async_test<'a, T>(future: impl Future<Output = T> + Send + 'a) -> T {
} }
} }
#[test_resources("crates/next-dev-tests/tests/integration/*/*/*")] #[testing::fixture("tests/integration/*/*/*")]
fn test(resource: &str) { fn test(resource: PathBuf) {
if resource.ends_with("__skipped__") || resource.ends_with("__flakey__") { if resource.ends_with("__skipped__") || resource.ends_with("__flakey__") {
// "Skip" directories named `__skipped__`, which include test directories to // "Skip" directories named `__skipped__`, which include test directories to
// skip. These tests are not considered truly skipped by `cargo test`, but they // skip. These tests are not considered truly skipped by `cargo test`, but they
...@@ -142,9 +140,9 @@ fn test(resource: &str) { ...@@ -142,9 +140,9 @@ fn test(resource: &str) {
}; };
} }
#[test_resources("crates/next-dev-tests/tests/integration/*/*/__skipped__/*")] #[testing::fixture("tests/integration/*/*/__skipped__/*")]
#[should_panic] #[should_panic]
fn test_skipped_fails(resource: &str) { fn test_skipped_fails(resource: PathBuf) {
let run_result = run_async_test(run_test(resource)); let run_result = run_async_test(run_test(resource));
// Assert that this skipped test itself has at least one browser test which // Assert that this skipped test itself has at least one browser test which
...@@ -160,35 +158,32 @@ fn test_skipped_fails(resource: &str) { ...@@ -160,35 +158,32 @@ fn test_skipped_fails(resource: &str) {
); );
} }
async fn run_test(resource: &str) -> JestRunResult { async fn run_test(resource: PathBuf) -> JestRunResult {
register(); register();
let path = Path::new(resource) let resource = canonicalize(resource).unwrap();
// test_resources matches and returns relative paths from the workspace root, assert!(resource.exists(), "{} does not exist", resource.display());
// but pwd in cargo tests is the crate under test.
.strip_prefix("crates/next-dev-tests")
.unwrap();
assert!(path.exists(), "{} does not exist", resource);
assert!( assert!(
path.is_dir(), resource.is_dir(),
"{} is not a directory. Integration tests must be directories.", "{} is not a directory. Integration tests must be directories.",
path.to_str().unwrap() resource.to_str().unwrap()
); );
let package_root = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let package_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let cargo_workspace_root = package_root let cargo_workspace_root = canonicalize(package_root)
.unwrap()
.parent() .parent()
.unwrap() .unwrap()
.parent() .parent()
.unwrap() .unwrap()
.to_path_buf(); .to_path_buf();
let test_dir = cargo_workspace_root.join(resource);
let workspace_root = canonicalize(PathBuf::from(env!("PNPM_WORKSPACE_DIR"))).unwrap(); let test_dir = resource.to_path_buf();
let workspace_root = cargo_workspace_root.parent().unwrap().parent().unwrap();
let project_dir = test_dir.join("input"); let project_dir = test_dir.join("input");
let requested_addr = get_free_local_addr().unwrap(); let requested_addr = get_free_local_addr().unwrap();
let mock_dir = path.join("__httpmock__"); let mock_dir = resource.join("__httpmock__");
let mock_server_future = get_mock_server_future(&mock_dir); let mock_server_future = get_mock_server_future(&mock_dir);
let (issue_tx, mut issue_rx) = unbounded_channel(); let (issue_tx, mut issue_rx) = unbounded_channel();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment