Introduce integration_test_credentials crate to make credentials reusable (#993)

Author: oguzkocer

Cargo.lock

@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "integration_test_credentials",
   "wp_api",
   "wp_api_integration_tests",
   "wp_api_integration_tests_backend",

Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "integration_test_credentials"
+version = "0.1.0"
+edition = "2024"
+
+[build-dependencies]
+serde_json = { workspace = true }

integration_test_credentials/Cargo.toml

@@ -0,0 +1,60 @@
+// A `TestCredentials::instance()` function will be generated by this
+include!(concat!(env!("OUT_DIR"), "/generated_test_credentials.rs"));
+
+#[derive(Debug, Default)]
+pub struct TestCredentials {
+    pub site_url: &'static str,
+    pub admin_username: &'static str,
+    pub admin_password: &'static str,
+    pub admin_password_uuid: &'static str,
+    pub subscriber_username: &'static str,
+    pub subscriber_password: &'static str,
+    pub subscriber_password_uuid: &'static str,
+    pub author_username: &'static str,
+    pub author_password: &'static str,
+    pub password_protected_post_id: i64,
+    pub password_protected_post_password: &'static str,
+    pub password_protected_post_title: &'static str,
+    pub password_protected_comment_id: i64,
+    pub password_protected_comment_author: &'static str,
+    pub trashed_post_id: i64,
+    pub first_post_date_gmt: &'static str,
+    pub wordpress_core_version: &'static str,
+    pub integration_test_custom_template_id: &'static str,
+    pub revisioned_post_id: i64,
+    pub revision_id_for_revisioned_post_id: i64,
+    pub autosaved_post_id: i64,
+    pub autosave_id_for_autosaved_post_id: i64,
+    pub password_protected_page_id: i64,
+    pub password_protected_page_password: &'static str,
+    pub password_protected_page_title: &'static str,
+    pub trashed_page_id: i64,
+    pub first_page_id: i64,
+    pub revisioned_page_id: i64,
+    pub revision_id_for_revisioned_page_id: i64,
+    pub autosaved_page_id: i64,
+    pub autosave_id_for_autosaved_page_id: i64,
+    pub primary_menu_location: &'static str,
+    pub footer_menu_location: &'static str,
+    pub nav_menu_item_id: i64,
+    pub autosave_id_for_nav_menu_item_id: i64,
+    pub navigation_id: i64,
+    pub revision_id_for_navigation_id: i64,
+    pub autosaved_navigation_id: i64,
+    pub autosave_id_for_autosaved_navigation_id: i64,
+}
+
+impl TestCredentials {
+    pub fn date_format() -> &'static str {
+        "%Y-%m-%d %H:%M:%S"
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct WpComTestCredentials {
+    pub bearer_token: &'static str,
+    pub site_id: u64,
+    pub wp_com_subscriber_user_id: i64,
+    pub email_subscriber_subscription_id: u64,
+    pub comment_id: i64,
+}

wp_api_integration_tests/build.rs renamed to integration_test_credentials/build.rs

@@ -13,6 +13,7 @@ async-trait = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 futures = { workspace = true }
 http = { workspace = true }
+integration_test_credentials = { path = "../integration_test_credentials" }
 reqwest = { workspace = true, features = [ "multipart", "json", "stream", "gzip", "brotli", "zstd", "deflate" ] }
 rstest = { workspace = true }
 rstest_reuse = { workspace = true }

integration_test_credentials/src/lib.rs

@@ -7,67 +7,6 @@ use wp_api::{
 pub mod mock;
 pub mod prelude;
 
-// A `TestCredentials::instance()` function will be generated by this
-include!(concat!(env!("OUT_DIR"), "/generated_test_credentials.rs"));
-
-#[derive(Debug, Default)]
-pub struct TestCredentials {
-    pub site_url: &'static str,
-    pub admin_username: &'static str,
-    pub admin_password: &'static str,
-    pub admin_password_uuid: &'static str,
-    pub subscriber_username: &'static str,
-    pub subscriber_password: &'static str,
-    pub subscriber_password_uuid: &'static str,
-    pub author_username: &'static str,
-    pub author_password: &'static str,
-    pub password_protected_post_id: i64,
-    pub password_protected_post_password: &'static str,
-    pub password_protected_post_title: &'static str,
-    pub password_protected_comment_id: i64,
-    pub password_protected_comment_author: &'static str,
-    pub trashed_post_id: i64,
-    pub first_post_date_gmt: &'static str,
-    pub wordpress_core_version: &'static str,
-    pub integration_test_custom_template_id: &'static str,
-    pub revisioned_post_id: i64,
-    pub revision_id_for_revisioned_post_id: i64,
-    pub autosaved_post_id: i64,
-    pub autosave_id_for_autosaved_post_id: i64,
-    pub password_protected_page_id: i64,
-    pub password_protected_page_password: &'static str,
-    pub password_protected_page_title: &'static str,
-    pub trashed_page_id: i64,
-    pub first_page_id: i64,
-    pub revisioned_page_id: i64,
-    pub revision_id_for_revisioned_page_id: i64,
-    pub autosaved_page_id: i64,
-    pub autosave_id_for_autosaved_page_id: i64,
-    pub primary_menu_location: &'static str,
-    pub footer_menu_location: &'static str,
-    pub nav_menu_item_id: i64,
-    pub autosave_id_for_nav_menu_item_id: i64,
-    pub navigation_id: i64,
-    pub revision_id_for_navigation_id: i64,
-    pub autosaved_navigation_id: i64,
-    pub autosave_id_for_autosaved_navigation_id: i64,
-}
-
-impl TestCredentials {
-    pub fn date_format() -> &'static str {
-        "%Y-%m-%d %H:%M:%S"
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct WpComTestCredentials {
-    pub bearer_token: &'static str,
-    pub site_id: u64,
-    pub wp_com_subscriber_user_id: i64,
-    pub email_subscriber_subscription_id: u64,
-    pub comment_id: i64,
-}
-
 pub mod backend;
 
 // The first user is also the current user

wp_api_integration_tests/Cargo.toml

@@ -6,15 +6,16 @@ pub use crate::{
     POST_ID_555, POST_ID_DRAFT, POST_ID_INVALID, POST_ID_NAV_MENUS_PARAM,
     POST_TEMPLATE_SINGLE_WITH_SIDEBAR, SECOND_COMMENT_ID, SECOND_USER_EMAIL, SECOND_USER_ID,
     SECOND_USER_SLUG, TAG_ID_100, TEMPLATE_TWENTY_TWENTY_FOUR_SINGLE, TERM_ID_INVALID,
-    THEME_TWENTY_TWENTY_FIVE, THEME_TWENTY_TWENTY_FOUR, THEME_TWENTY_TWENTY_THREE, TestCredentials,
-    USER_ID_INVALID, WP_ORG_PLUGIN_SLUG_CLASSIC_WIDGETS, api_client, api_client_as_author,
-    api_client_as_subscriber, api_client_with_auth_provider,
+    THEME_TWENTY_TWENTY_FIVE, THEME_TWENTY_TWENTY_FOUR, THEME_TWENTY_TWENTY_THREE, USER_ID_INVALID,
+    WP_ORG_PLUGIN_SLUG_CLASSIC_WIDGETS, api_client, api_client_as_author, api_client_as_subscriber,
+    api_client_with_auth_provider,
     backend::{Backend, RestoreServer},
     mock::{MockExecutor, response_helpers},
     test_site_api_url_resolver, test_site_url, unwrapped_wp_gmt_date_time,
 };
 pub use async_trait::async_trait;
 pub use http::{HeaderMap, HeaderValue};
+pub use integration_test_credentials::{TestCredentials, WpComTestCredentials};
 pub use rstest::*;
 pub use rstest_reuse::{self, apply, template};
 pub use serial_test::{parallel, serial};

wp_api_integration_tests/src/lib.rs

@@ -2,8 +2,7 @@ use wp_api::{
     comments::{CommentId, CommentRetrieveParams},
     wp_com::endpoint::extensions::comments::WpComCommentExtensionProvider,
 };
-
-use wp_api_integration_tests::{WpComTestCredentials, api_client_backed_by_wp_com, prelude::*};
+use wp_api_integration_tests::{api_client_backed_by_wp_com, prelude::*};
 
 #[tokio::test]
 #[parallel]

wp_api_integration_tests/src/prelude.rs

@@ -5,7 +5,7 @@ use wp_api::wp_com::{
         ListSubscribersSortField, SubscribersListParams, SubscriptionId,
     },
 };
-use wp_api_integration_tests::{WpComTestCredentials, prelude::*, wp_com_client};
+use wp_api_integration_tests::{prelude::*, wp_com_client};
 
 #[tokio::test]
 #[apply(list_cases)]