Skip to content

editoast: authz: update several tests to use the TestExtClient API #17752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sh099078 merged 1 commit into from
Jul 22, 2026
Merged

editoast: authz: update several tests to use the TestExtClient API #17752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 24 additions & 66 deletions editoast/authz/src/v2/group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,31 +106,23 @@ mod tests {

use crate::Subject;
use crate::v2::TestClientExt as _;
use crate::v2::special_authorizers::Authorize;

use super::*;

#[tokio::test]
async fn add_members_idempotent() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
HashSet::from_iter([User(1), User(2)])
);

add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
Expand All @@ -141,24 +133,17 @@ mod tests {
#[tokio::test]
async fn add_members_intersecting_calls() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
HashSet::from_iter([User(1), User(2)])
);

add_members(Group(1), HashSet::from_iter([User(1), User(3)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(3)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
Expand All @@ -169,35 +154,25 @@ mod tests {
#[tokio::test]
async fn remove_members_idempotent() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
HashSet::from_iter([User(1), User(2)])
);

remove_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.remove_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
HashSet::from_iter([])
);

remove_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.remove_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
Expand All @@ -208,35 +183,25 @@ mod tests {
#[tokio::test]
async fn remove_members_intersecting_calls() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

add_members(Group(1), HashSet::from_iter([User(1), User(2), User(3)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(2), User(3)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
HashSet::from_iter([User(1), User(2), User(3)])
);

remove_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.remove_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
HashSet::from_iter([User(3)])
);

remove_members(Group(1), HashSet::from_iter([User(1), User(3)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.remove_members(Group(1), HashSet::from_iter([User(1), User(3)]))
.await;
assert_eq!(
openfga.group_members(&Group(1)).await,
Expand All @@ -253,19 +218,12 @@ mod tests {
#[tokio::test]
async fn user_groups_some() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(1), HashSet::from_iter([User(1), User(2)]))
.await;
add_members(Group(2), HashSet::from_iter([User(1)]))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.add_members(Group(2), HashSet::from_iter([User(1)]))
.await;

assert_eq!(
Expand Down
39 changes: 9 additions & 30 deletions editoast/authz/src/v2/infra.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,14 +467,10 @@ mod tests {
#[tokio::test]
async fn user_infra_direct_grant() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

let infra_grant = async |user_id: i64| {
infra_direct_grant(Subject::user(user_id), Infra(1))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.infra_direct_grant(Subject::user(user_id), Infra(1))
.await
};

Expand All @@ -497,14 +493,10 @@ mod tests {
#[tokio::test]
async fn group_infra_direct_grant() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

let infra_grant = async |group_id: i64| {
infra_direct_grant(Subject::group(group_id), Infra(1))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.infra_direct_grant(Subject::group(group_id), Infra(1))
.await
};

Expand All @@ -527,7 +519,6 @@ mod tests {
#[tokio::test]
async fn no_inference_infra_direct_grant() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

openfga
.prepare_writes()
Expand All @@ -543,20 +534,14 @@ mod tests {
.unwrap();

let user_direct_grant = async |user_id: i64| {
infra_direct_grant(Subject::user(user_id), Infra(1))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.infra_direct_grant(Subject::user(user_id), Infra(1))
.await
};

let group_direct_grant = async |group_id: i64| {
infra_direct_grant(Subject::group(group_id), Infra(1))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
openfga
.infra_direct_grant(Subject::group(group_id), Infra(1))
.await
};

Expand All @@ -574,7 +559,6 @@ mod tests {
#[should_panic]
async fn infra_direct_grant_inconsistent_state_panics() {
let openfga = crate::authz_client!();
let authorize = Authorize(&openfga);

openfga
.prepare_writes()
Expand All @@ -584,12 +568,7 @@ mod tests {
.await
.unwrap();

infra_direct_grant(Subject::user(1), Infra(1))
.authorize(&authorize)
.await
.unwrap()
.unwrap_authorized()
.await;
openfga.infra_direct_grant(Subject::user(1), Infra(1)).await;
}

#[rstest::rstest]
Expand Down
Loading
Loading