eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix all tests (#3332)

Browse Source
This commit is contained in:
Jai Agrawal
2025-03-03 16:05:39 -08:00
committed by GitHub
parent e2de39ad83
commit 6859509eb5
26 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/labrinth/tests/common/api_common/generic.rs
View File

@@ -7,7 +7,7 @@ use labrinth::models::{
teams::{OrganizationPermissions, ProjectPermissions}, teams::{OrganizationPermissions, ProjectPermissions},
}; };
use ariadne::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile}; use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
use super::{ use super::{
models::{CommonProject, CommonVersion}, models::{CommonProject, CommonVersion},
@@ -81,7 +81,7 @@ delegate_api_variant!(
[add_gallery_item, ServiceResponse, id_or_slug: &str, image: ImageData, featured: bool, title: Option<String>, description: Option<String>, ordering: Option<i32>, pat: Option<&str>], [add_gallery_item, ServiceResponse, id_or_slug: &str, image: ImageData, featured: bool, title: Option<String>, description: Option<String>, ordering: Option<i32>, pat: Option<&str>],
[remove_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, pat: Option<&str>], [remove_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, pat: Option<&str>],
[edit_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, patch: HashMap<String, String>, pat: Option<&str>], [edit_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, patch: HashMap<String, String>, pat: Option<&str>],
[create_report, ServiceResponse, report_type: &str, id: &str, item_type: ariadne::api_common::models::CommonItemType, body: &str, pat: Option<&str>], [create_report, ServiceResponse, report_type: &str, id: &str, item_type: crate::common::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
[get_report, ServiceResponse, id: &str, pat: Option<&str>], [get_report, ServiceResponse, id: &str, pat: Option<&str>],
[get_reports, ServiceResponse, ids: &[&str], pat: Option<&str>], [get_reports, ServiceResponse, ids: &[&str], pat: Option<&str>],
[get_user_reports, ServiceResponse, pat: Option<&str>], [get_user_reports, ServiceResponse, pat: Option<&str>],
@@ -100,9 +100,9 @@ delegate_api_variant!(
#[async_trait(?Send)] #[async_trait(?Send)]
impl ApiTags for GenericApi { impl ApiTags for GenericApi {
[get_loaders, ServiceResponse,], [get_loaders, ServiceResponse,],
[get_loaders_deserialized_common, Vec<ariadne::api_common::models::CommonLoaderData>,], [get_loaders_deserialized_common, Vec<crate::common::api_common::models::CommonLoaderData>,],
[get_categories, ServiceResponse,], [get_categories, ServiceResponse,],
[get_categories_deserialized_common, Vec<ariadne::api_common::models::CommonCategoryData>,], [get_categories_deserialized_common, Vec<crate::common::api_common::models::CommonCategoryData>,],
} }
); );
@@ -110,18 +110,18 @@ delegate_api_variant!(
#[async_trait(?Send)] #[async_trait(?Send)]
impl ApiTeams for GenericApi { impl ApiTeams for GenericApi {
[get_team_members, ServiceResponse, team_id: &str, pat: Option<&str>], [get_team_members, ServiceResponse, team_id: &str, pat: Option<&str>],
[get_team_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>], [get_team_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
[get_teams_members, ServiceResponse, ids: &[&str], pat: Option<&str>], [get_teams_members, ServiceResponse, ids: &[&str], pat: Option<&str>],
[get_project_members, ServiceResponse, id_or_slug: &str, pat: Option<&str>], [get_project_members, ServiceResponse, id_or_slug: &str, pat: Option<&str>],
[get_project_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>], [get_project_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
[get_organization_members, ServiceResponse, id_or_title: &str, pat: Option<&str>], [get_organization_members, ServiceResponse, id_or_title: &str, pat: Option<&str>],
[get_organization_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>], [get_organization_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
[join_team, ServiceResponse, team_id: &str, pat: Option<&str>], [join_team, ServiceResponse, team_id: &str, pat: Option<&str>],
[remove_from_team, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>], [remove_from_team, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
[edit_team_member, ServiceResponse, team_id: &str, user_id: &str, patch: serde_json::Value, pat: Option<&str>], [edit_team_member, ServiceResponse, team_id: &str, user_id: &str, patch: serde_json::Value, pat: Option<&str>],
[transfer_team_ownership, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>], [transfer_team_ownership, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
[get_user_notifications, ServiceResponse, user_id: &str, pat: Option<&str>], [get_user_notifications, ServiceResponse, user_id: &str, pat: Option<&str>],
[get_user_notifications_deserialized_common, Vec<ariadne::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>], [get_user_notifications_deserialized_common, Vec<crate::common::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
[get_notification, ServiceResponse, notification_id: &str, pat: Option<&str>], [get_notification, ServiceResponse, notification_id: &str, pat: Option<&str>],
[get_notifications, ServiceResponse, ids: &[&str], pat: Option<&str>], [get_notifications, ServiceResponse, ids: &[&str], pat: Option<&str>],
[mark_notification_read, ServiceResponse, notification_id: &str, pat: Option<&str>], [mark_notification_read, ServiceResponse, notification_id: &str, pat: Option<&str>],

2
apps/labrinth/tests/common/api_common/request_data.rs
View File

@@ -3,7 +3,7 @@
use labrinth::util::actix::MultipartSegment; use labrinth::util::actix::MultipartSegment;
use ariadne::dummy_data::TestFile; use crate::common::dummy_data::TestFile;
#[allow(dead_code)] #[allow(dead_code)]
pub struct ProjectCreationRequestData { pub struct ProjectCreationRequestData {

2
apps/labrinth/tests/common/api_v2/project.rs
View File

@@ -24,7 +24,7 @@ use labrinth::{
}; };
use serde_json::json; use serde_json::json;
use ariadne::database::MOD_USER_PAT; use crate::common::database::MOD_USER_PAT;
use super::{ use super::{
request_data::{self, get_public_project_creation_data}, request_data::{self, get_public_project_creation_data},

2
apps/labrinth/tests/common/api_v2/request_data.rs
View File

@@ -1,7 +1,7 @@
#![allow(dead_code)] #![allow(dead_code)]
use serde_json::json; use serde_json::json;
use ariadne::{ use crate::common::{
api_common::request_data::{ api_common::request_data::{
ProjectCreationRequestData, VersionCreationRequestData, ProjectCreationRequestData, VersionCreationRequestData,
}, },

2
apps/labrinth/tests/common/api_v2/user.rs
View File

@@ -1,6 +1,6 @@
use super::ApiV2; use super::ApiV2;
use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
use actix_web::{dev::ServiceResponse, test}; use actix_web::{dev::ServiceResponse, test};
use ariadne::api_common::{Api, ApiUser, AppendsOptionalPat};
use async_trait::async_trait; use async_trait::async_trait;
#[async_trait(?Send)] #[async_trait(?Send)]

2
apps/labrinth/tests/common/api_v3/request_data.rs
View File

@@ -1,7 +1,7 @@
#![allow(dead_code)] #![allow(dead_code)]
use serde_json::json; use serde_json::json;
use ariadne::{ use crate::common::{
api_common::request_data::{ api_common::request_data::{
ProjectCreationRequestData, VersionCreationRequestData, ProjectCreationRequestData, VersionCreationRequestData,
}, },

2
apps/labrinth/tests/common/api_v3/user.rs
View File

@@ -1,7 +1,7 @@
use actix_web::{dev::ServiceResponse, test}; use actix_web::{dev::ServiceResponse, test};
use async_trait::async_trait; use async_trait::async_trait;
use ariadne::api_common::{Api, ApiUser, AppendsOptionalPat}; use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
use super::ApiV3; use super::ApiV3;

2
apps/labrinth/tests/common/asserts.rs
View File

@@ -1,6 +1,6 @@
#![allow(dead_code)] #![allow(dead_code)]
use ariadne::get_json_val_str; use crate::common::get_json_val_str;
use itertools::Itertools; use itertools::Itertools;
use labrinth::models::v3::projects::Version; use labrinth::models::v3::projects::Version;

2
apps/labrinth/tests/common/database.rs
View File

@@ -5,7 +5,7 @@ use sqlx::{postgres::PgPoolOptions, PgPool};
use std::time::Duration; use std::time::Duration;
use url::Url; use url::Url;
use ariadne::{dummy_data, environment::TestEnvironment}; use crate::common::{dummy_data, environment::TestEnvironment};
use super::{api_v3::ApiV3, dummy_data::DUMMY_DATA_UPDATE}; use super::{api_v3::ApiV3, dummy_data::DUMMY_DATA_UPDATE};

2
apps/labrinth/tests/common/permissions.rs
View File

@@ -6,7 +6,7 @@ use itertools::Itertools;
use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions}; use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
use serde_json::json; use serde_json::json;
use ariadne::{ use crate::common::{
api_common::ApiTeams, api_common::ApiTeams,
database::{generate_random_name, ADMIN_USER_PAT}, database::{generate_random_name, ADMIN_USER_PAT},
}; };

10
apps/labrinth/tests/loader_fields.rs
View File

@@ -9,11 +9,13 @@ use labrinth::database::models::legacy_loader_fields::MinecraftGameVersion;
use labrinth::models::v3; use labrinth::models::v3;
use serde_json::json; use serde_json::json;
use ariadne::api_common::{ApiProject, ApiVersion}; use crate::common::api_common::{ApiProject, ApiVersion};
use ariadne::api_v3::request_data::get_public_project_creation_data; use crate::common::api_v3::request_data::get_public_project_creation_data;
use ariadne::database::*; use crate::common::database::*;
use ariadne::dummy_data::{DummyProjectAlpha, DummyProjectBeta, TestFile}; use crate::common::dummy_data::{
DummyProjectAlpha, DummyProjectBeta, TestFile,
};
// importing common module. // importing common module.
mod common; mod common;

2
apps/labrinth/tests/notifications.rs
View File

@@ -3,7 +3,7 @@ use common::{
environment::with_test_environment_all, environment::with_test_environment_all,
}; };
use ariadne::api_common::ApiTeams; use crate::common::api_common::ApiTeams;
mod common; mod common;

4
apps/labrinth/tests/organizations.rs
View File

@@ -1,5 +1,4 @@
use actix_http::StatusCode; use crate::common::{
use ariadne::{
api_common::{ApiProject, ApiTeams}, api_common::{ApiProject, ApiTeams},
database::{ database::{
generate_random_name, ADMIN_USER_PAT, ENEMY_USER_ID_PARSED, generate_random_name, ADMIN_USER_PAT, ENEMY_USER_ID_PARSED,
@@ -10,6 +9,7 @@ use ariadne::{
DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta, DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta,
}, },
}; };
use actix_http::StatusCode;
use common::{ use common::{
api_v3::ApiV3, api_v3::ApiV3,
database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT}, database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT},

2
apps/labrinth/tests/pats.rs
View File

@@ -6,7 +6,7 @@ use common::{database::*, environment::with_test_environment_all};
use labrinth::models::pats::Scopes; use labrinth::models::pats::Scopes;
use serde_json::json; use serde_json::json;
use ariadne::api_common::AppendsOptionalPat; use crate::common::api_common::AppendsOptionalPat;
mod common; mod common;

8
apps/labrinth/tests/project.rs
View File

@@ -18,10 +18,10 @@ use labrinth::models::teams::ProjectPermissions;
use labrinth::util::actix::{MultipartSegment, MultipartSegmentData}; use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
use serde_json::json; use serde_json::json;
use ariadne::api_common::models::CommonProject; use crate::common::api_common::models::CommonProject;
use ariadne::api_common::request_data::ProjectCreationRequestData; use crate::common::api_common::request_data::ProjectCreationRequestData;
use ariadne::api_common::{ApiProject, ApiTeams, ApiVersion}; use crate::common::api_common::{ApiProject, ApiTeams, ApiVersion};
use ariadne::dummy_data::{ use crate::common::dummy_data::{
DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta, DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta,
TestFile, TestFile,
}; };

10
apps/labrinth/tests/scopes.rs
View File

@@ -1,11 +1,13 @@
use std::collections::HashMap; use std::collections::HashMap;
use actix_http::StatusCode; use crate::common::api_common::{
use actix_web::test;
use ariadne::api_common::{
ApiProject, ApiTeams, ApiUser, ApiVersion, AppendsOptionalPat, ApiProject, ApiTeams, ApiUser, ApiVersion, AppendsOptionalPat,
}; };
use ariadne::dummy_data::{DummyImage, DummyProjectAlpha, DummyProjectBeta}; use crate::common::dummy_data::{
DummyImage, DummyProjectAlpha, DummyProjectBeta,
};
use actix_http::StatusCode;
use actix_web::test;
use ariadne::ids::base62_impl::parse_base62; use ariadne::ids::base62_impl::parse_base62;
use chrono::{Duration, Utc}; use chrono::{Duration, Utc};
use common::api_common::models::CommonItemType; use common::api_common::models::CommonItemType;

2
apps/labrinth/tests/tags.rs
View File

@@ -7,7 +7,7 @@ use common::{
}, },
}; };
use ariadne::api_common::ApiTags; use crate::common::api_common::ApiTags;
mod common; mod common;

2
apps/labrinth/tests/teams.rs
View File

@@ -1,5 +1,5 @@
use crate::common::{api_common::ApiTeams, database::*};
use actix_http::StatusCode; use actix_http::StatusCode;
use ariadne::{api_common::ApiTeams, database::*};
use common::{ use common::{
api_v3::ApiV3, api_v3::ApiV3,
environment::{ environment::{

2
apps/labrinth/tests/user.rs
View File

@@ -1,4 +1,4 @@
use ariadne::api_common::{ApiProject, ApiTeams}; use crate::common::api_common::{ApiProject, ApiTeams};
use common::dummy_data::TestFile; use common::dummy_data::TestFile;
use common::{ use common::{
database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_ID, USER_USER_PAT}, database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_ID, USER_USER_PAT},

6
apps/labrinth/tests/v2/error.rs
View File

@@ -1,12 +1,12 @@
use crate::assert_status; use crate::assert_status;
use ariadne::api_common::ApiProject; use crate::common::api_common::ApiProject;
use actix_http::StatusCode; use actix_http::StatusCode;
use actix_web::test; use actix_web::test;
use bytes::Bytes; use bytes::Bytes;
use ariadne::database::USER_USER_PAT; use crate::common::database::USER_USER_PAT;
use ariadne::{ use crate::common::{
api_v2::ApiV2, api_v2::ApiV2,
environment::{with_test_environment, TestEnvironment}, environment::{with_test_environment, TestEnvironment},
}; };

2
apps/labrinth/tests/v2/notifications.rs
View File

@@ -1,4 +1,4 @@
use ariadne::{ use crate::common::{
api_common::ApiTeams, api_common::ApiTeams,
api_v2::ApiV2, api_v2::ApiV2,
database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT}, database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT},

16
apps/labrinth/tests/v2/scopes.rs
View File

@@ -1,12 +1,12 @@
use ariadne::api_common::ApiProject; use crate::common::api_common::ApiProject;
use ariadne::api_common::ApiVersion; use crate::common::api_common::ApiVersion;
use ariadne::api_v2::request_data::get_public_project_creation_data; use crate::common::api_v2::request_data::get_public_project_creation_data;
use ariadne::api_v2::ApiV2; use crate::common::api_v2::ApiV2;
use ariadne::dummy_data::TestFile; use crate::common::dummy_data::TestFile;
use ariadne::environment::with_test_environment; use crate::common::environment::with_test_environment;
use ariadne::environment::TestEnvironment; use crate::common::environment::TestEnvironment;
use crate::common::scopes::ScopeTest;
use ariadne::ids::base62_impl::parse_base62; use ariadne::ids::base62_impl::parse_base62;
use ariadne::scopes::ScopeTest;
use labrinth::models::pats::Scopes; use labrinth::models::pats::Scopes;
use labrinth::models::projects::ProjectId; use labrinth::models::projects::ProjectId;

18
apps/labrinth/tests/v2/search.rs
View File

@@ -1,15 +1,15 @@
use crate::assert_status; use crate::assert_status;
use ariadne::api_common::Api; use crate::common::api_common::Api;
use ariadne::api_common::ApiProject; use crate::common::api_common::ApiProject;
use ariadne::api_common::ApiVersion; use crate::common::api_common::ApiVersion;
use ariadne::api_v2::ApiV2; use crate::common::api_v2::ApiV2;
use crate::common::database::*;
use crate::common::dummy_data::TestFile;
use crate::common::dummy_data::DUMMY_CATEGORIES;
use crate::common::environment::with_test_environment;
use crate::common::environment::TestEnvironment;
use actix_http::StatusCode; use actix_http::StatusCode;
use ariadne::database::*;
use ariadne::dummy_data::TestFile;
use ariadne::dummy_data::DUMMY_CATEGORIES;
use ariadne::environment::with_test_environment;
use ariadne::environment::TestEnvironment;
use ariadne::ids::base62_impl::parse_base62; use ariadne::ids::base62_impl::parse_base62;
use futures::stream::StreamExt; use futures::stream::StreamExt;
use serde_json::json; use serde_json::json;

2
apps/labrinth/tests/v2/tags.rs
View File

@@ -3,7 +3,7 @@ use labrinth::routes::v2::tags::DonationPlatformQueryData;
use std::collections::HashSet; use std::collections::HashSet;
use ariadne::{ use crate::common::{
api_v2::ApiV2, api_v2::ApiV2,
environment::{with_test_environment, TestEnvironment}, environment::{with_test_environment, TestEnvironment},
}; };

12
apps/labrinth/tests/v2/version.rs
View File

@@ -9,13 +9,13 @@ use labrinth::{
use serde_json::json; use serde_json::json;
use crate::assert_status; use crate::assert_status;
use ariadne::api_common::{ApiProject, ApiVersion}; use crate::common::api_common::{ApiProject, ApiVersion};
use ariadne::api_v2::ApiV2; use crate::common::api_v2::ApiV2;
use ariadne::api_v2::request_data::get_public_project_creation_data; use crate::common::api_v2::request_data::get_public_project_creation_data;
use ariadne::dummy_data::{DummyProjectAlpha, DummyProjectBeta}; use crate::common::dummy_data::{DummyProjectAlpha, DummyProjectBeta};
use ariadne::environment::{with_test_environment, TestEnvironment}; use crate::common::environment::{with_test_environment, TestEnvironment};
use ariadne::{ use crate::common::{
database::{ENEMY_USER_PAT, USER_USER_PAT}, database::{ENEMY_USER_PAT, USER_USER_PAT},
dummy_data::TestFile, dummy_data::TestFile,
}; };

10
apps/labrinth/tests/version.rs
View File

@@ -1,11 +1,13 @@
use std::collections::HashMap; use std::collections::HashMap;
use crate::common::api_common::ApiVersion;
use crate::common::database::*;
use crate::common::dummy_data::{
DummyProjectAlpha, DummyProjectBeta, TestFile,
};
use crate::common::get_json_val_str;
use actix_http::StatusCode; use actix_http::StatusCode;
use actix_web::test; use actix_web::test;
use ariadne::api_common::ApiVersion;
use ariadne::database::*;
use ariadne::dummy_data::{DummyProjectAlpha, DummyProjectBeta, TestFile};
use ariadne::get_json_val_str;
use ariadne::ids::base62_impl::parse_base62; use ariadne::ids::base62_impl::parse_base62;
use common::api_v3::ApiV3; use common::api_v3::ApiV3;
use common::asserts::assert_common_version_ids; use common::asserts::assert_common_version_ids;