From 0a5775ab3ea1e0caf62ed1e7c4b040ff87120f32 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 22 May 2024 11:30:11 -0400 Subject: [PATCH 1/3] Merge wp_networking crate to wp_api --- Cargo.lock | 106 +++++++++--------- Cargo.toml | 1 - Makefile | 3 +- wp_api/Cargo.toml | 7 ++ .../tests/test_helpers.rs | 49 +++++++- .../tests/test_plugins_err.rs | 0 .../tests/test_plugins_immut.rs | 0 .../tests/test_plugins_mut.rs | 0 .../tests/test_users_err.rs | 0 .../tests/test_users_immut.rs | 0 .../tests/test_users_mut.rs | 0 {wp_networking => wp_api}/tests/wp_db.rs | 0 wp_networking/Cargo.toml | 18 --- wp_networking/src/lib.rs | 58 ---------- 14 files changed, 105 insertions(+), 137 deletions(-) rename {wp_networking => wp_api}/tests/test_helpers.rs (81%) rename {wp_networking => wp_api}/tests/test_plugins_err.rs (100%) rename {wp_networking => wp_api}/tests/test_plugins_immut.rs (100%) rename {wp_networking => wp_api}/tests/test_plugins_mut.rs (100%) rename {wp_networking => wp_api}/tests/test_users_err.rs (100%) rename {wp_networking => wp_api}/tests/test_users_immut.rs (100%) rename {wp_networking => wp_api}/tests/test_users_mut.rs (100%) rename {wp_networking => wp_api}/tests/wp_db.rs (100%) delete mode 100644 wp_networking/Cargo.toml delete mode 100644 wp_networking/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 2f0a50673..3311e7ad8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,6 +164,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.2.0" @@ -297,9 +303,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.96" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -424,9 +430,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -475,9 +481,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" dependencies = [ "serde", ] @@ -499,9 +505,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -704,9 +710,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -738,15 +744,15 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", "indexmap", "slab", @@ -1019,9 +1025,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -1042,9 +1048,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -1102,9 +1108,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -1176,9 +1182,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1187,9 +1193,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -1506,7 +1512,6 @@ dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", - "futures-channel", "futures-core", "futures-util", "h2", @@ -1603,9 +1608,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1641,9 +1646,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "ryu" @@ -1688,11 +1693,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -1701,9 +1706,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -2281,16 +2286,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2943,12 +2947,18 @@ name = "wp_api" version = "0.1.0" dependencies = [ "base64 0.22.1", + "chrono", + "futures", "http 1.1.0", "parse_link_header", + "reqwest", "rstest", + "rstest_reuse", "serde", "serde_json", + "sqlx", "thiserror", + "tokio", "uniffi", "url", "wp_contextual", @@ -2967,22 +2977,6 @@ dependencies = [ "uniffi", ] -[[package]] -name = "wp_networking" -version = "0.1.0" -dependencies = [ - "chrono", - "futures", - "http 1.1.0", - "reqwest", - "rstest", - "rstest_reuse", - "serde_json", - "sqlx", - "tokio", - "wp_api", -] - [[package]] name = "wp_uniffi_bindgen" version = "0.1.0" @@ -2992,18 +2986,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 639c334d2..179be8260 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,6 @@ members = [ "wp_api", "wp_contextual", - "wp_networking", "wp_uniffi_bindgen", ] resolver = "2" diff --git a/Makefile b/Makefile index 4bec0180a..c2bb2d432 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,6 @@ docs: cp -r target/doc/static.files docs/static.files cp -r target/doc/wp_api docs/wp_api cp -r target/doc/wp_contextual docs/wp_contextual - cp -r target/doc/wp_networking docs/wp_networking docs-archive: docs tar -czvf docs.tar.gz docs @@ -84,7 +83,7 @@ xcframework-libraries: # Xcode doesn't properly support multiple XCFrameworks being used by the same target, so we need # to combine the binaries %-combine-libraries: - xcrun libtool -static -o target/$*/release/libwordpress.a target/$*/release/libwp_api.a #target/$*/release/libwp_networking.a + xcrun libtool -static -o target/$*/release/libwordpress.a target/$*/release/libwp_api.a # Some libraries need to be created in a multi-binary format, so we combine them here xcframework-combined-libraries: xcframework-libraries diff --git a/wp_api/Cargo.toml b/wp_api/Cargo.toml index ead396d4b..1020f945b 100644 --- a/wp_api/Cargo.toml +++ b/wp_api/Cargo.toml @@ -19,7 +19,14 @@ uniffi = { workspace = true } wp_contextual = { path = "../wp_contextual" } [dev-dependencies] +chrono = { version = "0.4" } +futures = "0.3" +reqwest = "0.12" rstest = { workspace = true } +rstest_reuse = { workspace = true } +serde_json = { workspace = true } +sqlx = { version = "0.7", features = [ "chrono", "mysql", "runtime-tokio", "tls-native-tls" ]} +tokio = { version = "1.37", features = [ "full" ] } [build-dependencies] uniffi = { workspace = true , features = [ "build", "cli" ] } diff --git a/wp_networking/tests/test_helpers.rs b/wp_api/tests/test_helpers.rs similarity index 81% rename from wp_networking/tests/test_helpers.rs rename to wp_api/tests/test_helpers.rs index ea5bd5aed..96067f27d 100644 --- a/wp_networking/tests/test_helpers.rs +++ b/wp_api/tests/test_helpers.rs @@ -1,12 +1,11 @@ use futures::Future; +use http::HeaderMap; use std::{fs::read_to_string, process::Command}; use wp_api::{ UserId, WPApiError, WPApiHelper, WPAuthentication, WPNetworkRequest, WPNetworkResponse, WPRestError, WPRestErrorCode, WPRestErrorWrapper, }; -use wp_networking::AsyncWPNetworking; - // The first user is also the current user pub const FIRST_USER_ID: UserId = UserId(1); pub const SECOND_USER_ID: UserId = UserId(2); @@ -176,3 +175,49 @@ where .status() .expect("Failed to restore wp-content/plugins"); } + +pub struct AsyncWPNetworking { + client: reqwest::Client, +} + +impl Default for AsyncWPNetworking { + fn default() -> Self { + Self { + client: reqwest::Client::new(), + } + } +} + +impl AsyncWPNetworking { + pub async fn async_request( + &self, + wp_request: WPNetworkRequest, + ) -> Result { + let request_headers: HeaderMap = (&wp_request.header_map).try_into().unwrap(); + + let mut request = self + .client + .request(Self::request_method(wp_request.method), wp_request.url) + .headers(request_headers); + if let Some(body) = wp_request.body { + request = request.body(body); + } + let response = request.send().await?; + + Ok(WPNetworkResponse { + status_code: response.status().as_u16(), + body: response.bytes().await.unwrap().to_vec(), + header_map: None, // TODO: Properly read the headers + }) + } + + fn request_method(method: wp_api::RequestMethod) -> http::Method { + match method { + wp_api::RequestMethod::GET => reqwest::Method::GET, + wp_api::RequestMethod::POST => reqwest::Method::POST, + wp_api::RequestMethod::PUT => reqwest::Method::PUT, + wp_api::RequestMethod::DELETE => reqwest::Method::DELETE, + wp_api::RequestMethod::HEAD => reqwest::Method::HEAD, + } + } +} diff --git a/wp_networking/tests/test_plugins_err.rs b/wp_api/tests/test_plugins_err.rs similarity index 100% rename from wp_networking/tests/test_plugins_err.rs rename to wp_api/tests/test_plugins_err.rs diff --git a/wp_networking/tests/test_plugins_immut.rs b/wp_api/tests/test_plugins_immut.rs similarity index 100% rename from wp_networking/tests/test_plugins_immut.rs rename to wp_api/tests/test_plugins_immut.rs diff --git a/wp_networking/tests/test_plugins_mut.rs b/wp_api/tests/test_plugins_mut.rs similarity index 100% rename from wp_networking/tests/test_plugins_mut.rs rename to wp_api/tests/test_plugins_mut.rs diff --git a/wp_networking/tests/test_users_err.rs b/wp_api/tests/test_users_err.rs similarity index 100% rename from wp_networking/tests/test_users_err.rs rename to wp_api/tests/test_users_err.rs diff --git a/wp_networking/tests/test_users_immut.rs b/wp_api/tests/test_users_immut.rs similarity index 100% rename from wp_networking/tests/test_users_immut.rs rename to wp_api/tests/test_users_immut.rs diff --git a/wp_networking/tests/test_users_mut.rs b/wp_api/tests/test_users_mut.rs similarity index 100% rename from wp_networking/tests/test_users_mut.rs rename to wp_api/tests/test_users_mut.rs diff --git a/wp_networking/tests/wp_db.rs b/wp_api/tests/wp_db.rs similarity index 100% rename from wp_networking/tests/wp_db.rs rename to wp_api/tests/wp_db.rs diff --git a/wp_networking/Cargo.toml b/wp_networking/Cargo.toml deleted file mode 100644 index e161c016b..000000000 --- a/wp_networking/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "wp_networking" -version = "0.1.0" -edition = "2021" - -[dependencies] -http = { workspace = true } -reqwest = { version = "0.12", features = ["blocking"] } -wp_api = { path = "../wp_api" } - -[dev-dependencies] -chrono = { version = "0.4" } -futures = "0.3" -rstest = { workspace = true } -rstest_reuse = { workspace = true } -serde_json = { workspace = true } -sqlx = { version = "0.7", features = [ "chrono", "mysql", "runtime-tokio", "tls-native-tls" ]} -tokio = { version = "1.37", features = [ "full" ] } diff --git a/wp_networking/src/lib.rs b/wp_networking/src/lib.rs deleted file mode 100644 index 69f1407ae..000000000 --- a/wp_networking/src/lib.rs +++ /dev/null @@ -1,58 +0,0 @@ -#![allow(dead_code, unused_variables)] - -use http::HeaderMap; -use wp_api::{WPNetworkRequest, WPNetworkResponse}; - -pub struct AsyncWPNetworking { - client: reqwest::Client, -} - -impl Default for AsyncWPNetworking { - fn default() -> Self { - Self { - client: reqwest::Client::new(), - } - } -} - -impl AsyncWPNetworking { - pub async fn async_request( - &self, - wp_request: WPNetworkRequest, - ) -> Result { - let request_headers: HeaderMap = (&wp_request.header_map).try_into().unwrap(); - - let mut request = self - .client - .request(request_method(wp_request.method), wp_request.url) - .headers(request_headers); - if let Some(body) = wp_request.body { - request = request.body(body); - } - let response = request.send().await?; - - Ok(WPNetworkResponse { - status_code: response.status().as_u16(), - body: response.bytes().await.unwrap().to_vec(), - header_map: None, // TODO: Properly read the headers - }) - } -} - -fn request_method(method: wp_api::RequestMethod) -> http::Method { - match method { - wp_api::RequestMethod::GET => reqwest::Method::GET, - wp_api::RequestMethod::POST => reqwest::Method::POST, - wp_api::RequestMethod::PUT => reqwest::Method::PUT, - wp_api::RequestMethod::DELETE => reqwest::Method::DELETE, - wp_api::RequestMethod::HEAD => reqwest::Method::HEAD, - } -} - -fn wp_network_response(response: reqwest::blocking::Response) -> WPNetworkResponse { - WPNetworkResponse { - status_code: response.status().as_u16(), - body: response.bytes().unwrap().to_vec(), - header_map: None, // TODO: Properly read the headers - } -} From eac02e4a0a7bb76e450859fb0a93115061b692be Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 22 May 2024 11:34:03 -0400 Subject: [PATCH 2/3] Rename src/test_helpers to src/unit_test_common --- wp_api/src/lib.rs | 2 +- wp_api/src/plugins.rs | 2 +- wp_api/src/{test_helpers.rs => unit_test_common.rs} | 0 wp_api/src/users.rs | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename wp_api/src/{test_helpers.rs => unit_test_common.rs} (100%) diff --git a/wp_api/src/lib.rs b/wp_api/src/lib.rs index 5425e9b43..b06aef0eb 100644 --- a/wp_api/src/lib.rs +++ b/wp_api/src/lib.rs @@ -22,7 +22,7 @@ pub mod url; pub mod users; #[cfg(test)] -mod test_helpers; +mod unit_test_common; const CONTENT_TYPE_JSON: &str = "application/json"; diff --git a/wp_api/src/plugins.rs b/wp_api/src/plugins.rs index 0d65c8bbf..6a7191e4b 100644 --- a/wp_api/src/plugins.rs +++ b/wp_api/src/plugins.rs @@ -188,7 +188,7 @@ pub struct PluginDescription { #[cfg(test)] mod tests { use super::*; - use crate::{generate, test_helpers::assert_expected_query_pairs}; + use crate::{generate, unit_test_common::assert_expected_query_pairs}; use rstest::*; #[rstest] diff --git a/wp_api/src/test_helpers.rs b/wp_api/src/unit_test_common.rs similarity index 100% rename from wp_api/src/test_helpers.rs rename to wp_api/src/unit_test_common.rs diff --git a/wp_api/src/users.rs b/wp_api/src/users.rs index ae4713d6c..a90880ceb 100644 --- a/wp_api/src/users.rs +++ b/wp_api/src/users.rs @@ -421,7 +421,7 @@ impl SparseField for SparseUserField { #[cfg(test)] mod tests { use super::*; - use crate::{generate, test_helpers::assert_expected_query_pairs}; + use crate::{generate, unit_test_common::assert_expected_query_pairs}; use rstest::*; #[rstest] From a4eb9bbaf4337d4020157b8b1aeb94d1895570f5 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 22 May 2024 11:36:22 -0400 Subject: [PATCH 3/3] Rename tests/test_helpers to tests/integration_test_common --- .../tests/{test_helpers.rs => integration_test_common.rs} | 0 wp_api/tests/test_plugins_err.rs | 4 ++-- wp_api/tests/test_plugins_immut.rs | 4 ++-- wp_api/tests/test_plugins_mut.rs | 4 ++-- wp_api/tests/test_users_err.rs | 8 ++++---- wp_api/tests/test_users_immut.rs | 4 ++-- wp_api/tests/test_users_mut.rs | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename wp_api/tests/{test_helpers.rs => integration_test_common.rs} (100%) diff --git a/wp_api/tests/test_helpers.rs b/wp_api/tests/integration_test_common.rs similarity index 100% rename from wp_api/tests/test_helpers.rs rename to wp_api/tests/integration_test_common.rs diff --git a/wp_api/tests/test_plugins_err.rs b/wp_api/tests/test_plugins_err.rs index 6d6a6a31b..927ca428b 100644 --- a/wp_api/tests/test_plugins_err.rs +++ b/wp_api/tests/test_plugins_err.rs @@ -1,11 +1,11 @@ use wp_api::{PluginCreateParams, PluginStatus, PluginUpdateParams, WPContext, WPRestErrorCode}; -use crate::test_helpers::{ +use crate::integration_test_common::{ api, api_as_subscriber, AssertWpError, WPNetworkRequestExecutor, WPNetworkResponseParser, HELLO_DOLLY_PLUGIN_SLUG, WP_ORG_PLUGIN_SLUG_CLASSIC_WIDGETS, }; -pub mod test_helpers; +pub mod integration_test_common; #[tokio::test] async fn create_plugin_err_cannot_install_plugin() { diff --git a/wp_api/tests/test_plugins_immut.rs b/wp_api/tests/test_plugins_immut.rs index e2ae6c091..fca4a3829 100644 --- a/wp_api/tests/test_plugins_immut.rs +++ b/wp_api/tests/test_plugins_immut.rs @@ -6,12 +6,12 @@ use wp_api::{ PluginSlug, SparsePlugin, SparsePluginField, WPContext, }; -use crate::test_helpers::{ +use crate::integration_test_common::{ api, WPNetworkRequestExecutor, WPNetworkResponseParser, CLASSIC_EDITOR_PLUGIN_SLUG, HELLO_DOLLY_PLUGIN_SLUG, }; -pub mod test_helpers; +pub mod integration_test_common; #[apply(filter_fields_cases)] #[tokio::test] diff --git a/wp_api/tests/test_plugins_mut.rs b/wp_api/tests/test_plugins_mut.rs index 690f2f3a2..edc51ea5d 100644 --- a/wp_api/tests/test_plugins_mut.rs +++ b/wp_api/tests/test_plugins_mut.rs @@ -1,11 +1,11 @@ use wp_api::{PluginCreateParams, PluginStatus, PluginUpdateParams}; -use crate::test_helpers::{ +use crate::integration_test_common::{ api, run_and_restore_wp_content_plugins, WPNetworkRequestExecutor, WPNetworkResponseParser, CLASSIC_EDITOR_PLUGIN_SLUG, HELLO_DOLLY_PLUGIN_SLUG, WP_ORG_PLUGIN_SLUG_CLASSIC_WIDGETS, }; -pub mod test_helpers; +pub mod integration_test_common; pub mod wp_db; #[tokio::test] diff --git a/wp_api/tests/test_users_err.rs b/wp_api/tests/test_users_err.rs index 33168de04..3c2675ede 100644 --- a/wp_api/tests/test_users_err.rs +++ b/wp_api/tests/test_users_err.rs @@ -1,15 +1,15 @@ -use test_helpers::SECOND_USER_EMAIL; +use integration_test_common::SECOND_USER_EMAIL; use wp_api::{ UserCreateParams, UserDeleteParams, UserId, UserListParams, UserUpdateParams, WPApiHelper, WPApiParamUsersOrderBy, WPApiParamUsersWho, WPAuthentication, WPContext, WPRestErrorCode, }; -use crate::test_helpers::{ +use crate::integration_test_common::{ api, api_as_subscriber, AssertWpError, WPNetworkRequestExecutor, WPNetworkResponseParser, FIRST_USER_ID, SECOND_USER_ID, SECOND_USER_SLUG, }; -pub mod test_helpers; +pub mod integration_test_common; #[tokio::test] async fn create_user_err_cannot_create_user() { @@ -157,7 +157,7 @@ async fn retrieve_user_err_user_invalid_id() { #[tokio::test] async fn retrieve_user_err_unauthorized() { WPApiHelper::new( - test_helpers::read_test_credentials_from_file().site_url, + integration_test_common::read_test_credentials_from_file().site_url, WPAuthentication::None, ) .retrieve_current_user_request(WPContext::Edit) diff --git a/wp_api/tests/test_users_immut.rs b/wp_api/tests/test_users_immut.rs index 6ca53f061..b22ead49b 100644 --- a/wp_api/tests/test_users_immut.rs +++ b/wp_api/tests/test_users_immut.rs @@ -5,11 +5,11 @@ use wp_api::{ WPApiParamUsersWho, WPContext, }; -use crate::test_helpers::{ +use crate::integration_test_common::{ api, WPNetworkRequestExecutor, WPNetworkResponseParser, FIRST_USER_ID, SECOND_USER_ID, }; -pub mod test_helpers; +pub mod integration_test_common; #[apply(filter_fields_cases)] #[tokio::test] diff --git a/wp_api/tests/test_users_mut.rs b/wp_api/tests/test_users_mut.rs index d6d553aa8..0a7319d96 100644 --- a/wp_api/tests/test_users_mut.rs +++ b/wp_api/tests/test_users_mut.rs @@ -1,11 +1,11 @@ use wp_api::{UserCreateParams, UserDeleteParams, UserUpdateParams}; use wp_db::{DbUser, DbUserMeta}; -use crate::test_helpers::{ +use crate::integration_test_common::{ api, WPNetworkRequestExecutor, WPNetworkResponseParser, FIRST_USER_ID, SECOND_USER_ID, }; -pub mod test_helpers; +pub mod integration_test_common; pub mod wp_db; #[tokio::test]