This commit is contained in:
2025-10-29 22:19:54 +01:00
parent 15f79d3d8b
commit 7a6ac5f0be
6 changed files with 14 additions and 38 deletions
+6 -8
View File
@@ -33,6 +33,8 @@ const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations");
static DB_LOCK: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
const TEST_TENANT_NAME: &str = "test_tenant";
#[allow(dead_code)]
#[derive(Clone)]
pub struct StoredObject {
@@ -140,7 +142,6 @@ impl TestApp {
s3_bucket: "test-bucket".to_string(),
quickwit_endpoint: None,
quickwit_index: None,
default_tenant_name: "admin".to_string(),
worker_max_document_bytes: 200 * 1024 * 1024,
webauthn_rp_id: Some("localhost".to_string()),
webauthn_origin: Some("http://localhost".to_string()),
@@ -190,10 +191,11 @@ impl TestApp {
#[allow(dead_code)]
pub async fn storage_key_for(&self, key: &str) -> Result<String> {
self.ensure_default_tenant().await?;
let tenant = self
.state
.tenants
.get_by_name(&self.state.config.default_tenant_name)
.get_by_name(TEST_TENANT_NAME)
.map_err(|err| anyhow!("default tenant not found: {:?}", err))?;
let root = tenant
.storage_root
@@ -205,11 +207,7 @@ impl TestApp {
pub async fn insert_user(&self, username: &str, password: &str, _role: &str) -> Result<Uuid> {
let username = username.to_string();
let password = password.to_string();
let tenant_id = self
.state
.tenants
.tenant_id_for_name(&self.state.config.default_tenant_name)
.map_err(|err| anyhow!("default tenant not found: {:?}", err))?;
let tenant_id = self.ensure_default_tenant().await?;
self.with_conn(move |conn| {
let password_hash = hash_password(&password)?;
let user = NewUser {
@@ -264,7 +262,7 @@ impl TestApp {
}
async fn ensure_default_tenant(&self) -> Result<Uuid> {
let name_value = self.state.config.default_tenant_name.clone();
let name_value = TEST_TENANT_NAME.to_string();
let quickwit_enabled = self.state.config.quickwit_endpoint.is_some();
self.with_conn(move |conn| {
use backend::schema::tenants::dsl as tenants_dsl;