Move wordpress_org_api code into wp_api (#441)

* Move wordpress_org_api code into wp_api

* Update plugin directory integration tests command

Cargo.toml

@@ -8,7 +8,6 @@ members = [
   "wp_derive_request_builder",
   "wp_serde_helper",
   "wp_uniffi_bindgen",
-  "wordpress_org_api",
   "xcframework",
 ]
 resolver = "2"

Makefile

@@ -184,7 +184,7 @@ test-rust-integration:
 	docker exec -i wordpress /bin/bash < ./scripts/run-rust-integration-tests.sh
 
 test-rust-integration-wordpress-org-api:
-	$(rust_docker_run) cargo test --package wordpress_org_api -- --nocapture
+	$(rust_docker_run) cargo test --package wp_api_integration_tests --test test_plugin_directory -- --nocapture
 
 test-kotlin-integration:
 	@# Help: Run Kotlin integration tests in test server.

wp_api/src/lib.rs

@@ -29,6 +29,7 @@ pub mod request;
 pub mod site_settings;
 pub mod url_query;
 pub mod users;
+pub mod wordpress_org;
 pub mod wp_site_health_tests;
 
 #[cfg(test)]

wp_api/src/wordpress_org/mod.rs

@@ -0,0 +1,2 @@
+mod de;
+pub mod plugin_directory;

wordpress_org_api/src/plugin_directory.rs → wp_api/src/wordpress_org/plugin_directory.rs

@@ -4,7 +4,7 @@ use serde::Deserialize;
 
 use std::{collections::HashMap, fmt::Debug};
 
-use crate::de::deserialize_default_values;
+use super::de::deserialize_default_values;
 
 #[derive(Deserialize, Debug)]
 pub struct PluginInformation {
@@ -166,13 +166,15 @@ mod tests {
 
     #[fixture]
     fn plugin_with_variant_types() -> Plugin {
-        let json_string = include_str!("../tests/plugin-with-different-types-of-values.json");
+        let json_string =
+            include_str!("../../tests/plugin-directory/plugin-with-different-types-of-values.json");
         Plugin::parse(json_string)
     }
 
     #[fixture]
     fn plugin_with_expected_types() -> Plugin {
-        let json_string = include_str!("../tests/plugin-with-expected-types.json");
+        let json_string =
+            include_str!("../../tests/plugin-directory/plugin-with-expected-types.json");
         Plugin::parse(json_string)
     }
 
@@ -318,7 +320,7 @@ mod tests {
 
     #[test]
     fn test_plugin_query_result() {
-        let json_string = include_str!("../tests/plugin-query-result.json");
+        let json_string = include_str!("../../tests/plugin-directory/plugin-query-result.json");
         let parsed = serde_json::from_str::<QueryPluginResponse>(json_string);
         assert!(parsed.is_ok(), "Failed to parse JSON: {:?}", parsed.err());
     }

wordpress_org_api/tests/test_plugin_directory.rs → wp_api_integration_tests/tests/test_plugin_directory.rs

@@ -3,7 +3,7 @@ use std::{
     io::{self, Write},
 };
 
-use wordpress_org_api::plugin_directory::*;
+use wp_api::wordpress_org::plugin_directory::*;
 
 async fn query_plugins_slugs(url: &str) -> Result<Vec<String>, reqwest::Error> {
     reqwest::get(url)