From d2b103d89927da9f154e0edcb898638a092af35c Mon Sep 17 00:00:00 2001 From: Avery Harnish Date: Thu, 12 Sep 2019 10:14:46 -0500 Subject: [PATCH 1/3] Add workers_dot_dev to test fixtures --- tests/build.rs | 1 + tests/preview.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/build.rs b/tests/build.rs index 867c42344..c4cfc551e 100644 --- a/tests/build.rs +++ b/tests/build.rs @@ -19,6 +19,7 @@ macro_rules! single_env_settings { name = "test" zone_id = "" account_id = "" + workers_dot_dev = true {} "#, $x diff --git a/tests/preview.rs b/tests/preview.rs index 15067e911..545fa5052 100644 --- a/tests/preview.rs +++ b/tests/preview.rs @@ -17,6 +17,7 @@ macro_rules! settings { name = "test" zone_id = "" account_id = "" + workers_dot_dev = true {} "#, $x From 826d00faffc4268e6df0246aa5ae45ccfa3b2a65 Mon Sep 17 00:00:00 2001 From: Avery Harnish Date: Thu, 12 Sep 2019 10:20:18 -0500 Subject: [PATCH 2/3] Rename to node test and add web test --- tests/build.rs | 27 +++++++++++++++++++-- tests/fixtures/webpack_target_node/index.js | 0 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 tests/fixtures/webpack_target_node/index.js diff --git a/tests/build.rs b/tests/build.rs index c4cfc551e..d39a6786e 100644 --- a/tests/build.rs +++ b/tests/build.rs @@ -172,8 +172,8 @@ fn it_builds_with_webpack_wast() { } #[test] -fn it_fails_with_webpack_target_web() { - let fixture = "webpack_target_web"; +fn it_fails_with_webpack_target_node() { + let fixture = "webpack_target_node"; create_temporary_copy(fixture); webpack_config( @@ -194,6 +194,29 @@ fn it_fails_with_webpack_target_web() { cleanup(fixture); } +#[test] +fn it_fails_with_webpack_target_web() { + let fixture = "webpack_target_web"; + create_temporary_copy(fixture); + + webpack_config( + fixture, + r#"{ + entry: "./index.js", + target: "web", + }"#, + ); + single_env_settings! {fixture, r#" + type = "webpack" + "#}; + + build_fails_with( + fixture, + "Building a Cloudflare Worker with target \"web\" is not supported", + ); + cleanup(fixture); +} + #[test] fn it_builds_with_webpack_target_webworker() { let fixture = "webpack_target_webworker"; diff --git a/tests/fixtures/webpack_target_node/index.js b/tests/fixtures/webpack_target_node/index.js new file mode 100644 index 000000000..e69de29bb From 65926a3cf5e1715360da5c7fe707a034115095b7 Mon Sep 17 00:00:00 2001 From: Avery Harnish Date: Thu, 12 Sep 2019 10:28:18 -0500 Subject: [PATCH 3/3] Remove message from bundle cleanup helper --- src/commands/build/wranglerjs/bundle.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/commands/build/wranglerjs/bundle.rs b/src/commands/build/wranglerjs/bundle.rs index a2a1a6c90..be6e2802b 100644 --- a/src/commands/build/wranglerjs/bundle.rs +++ b/src/commands/build/wranglerjs/bundle.rs @@ -7,8 +7,6 @@ use std::io::prelude::*; use std::path::{Path, PathBuf}; use crate::commands::build::wranglerjs::output::WranglerjsOutput; -#[cfg(test)] -use crate::terminal::message; // Directory where we should write the {Bundle}. It represents the built // artifact. @@ -142,7 +140,6 @@ mod tests { fn cleanup(name: String) { let current_dir = env::current_dir().unwrap(); let path = Path::new(¤t_dir).join(name); - message::info(&format!("p: {:?}", path)); fs::remove_dir_all(path).unwrap(); } }