Skip to content

Stabilize testSparScimCreateGetSearchUserGroup #5331

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
supersven merged 1 commit into from
Jul 10, 2026
Merged

Stabilize testSparScimCreateGetSearchUserGroup #5331

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
32 changes: 27 additions & 5 deletions integration/test/Test/Spar.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import Data.String.Conversions (cs)
import qualified Data.Text as ST
import qualified Data.UUID as UUID
import Data.UUID.V4 (nextRandom)
import qualified Data.Vector as V
import qualified SAML2.WebSSO as SAML
import qualified SAML2.WebSSO.Test.MockResponse as SAML
import qualified SAML2.WebSSO.Test.Util as SAML
Expand Down Expand Up @@ -467,16 +468,23 @@ testSparScimCreateGetSearchUserGroup = do
-- Test getting a single SCIM group by id
gid <- respGroup1.json %. "id" & asString
gottenGroup1 <- getScimUserGroup OwnDomain tok gid
respGroup1.json `shouldMatch` gottenGroup1.json
do
expected <- normalizeValue respGroup1.json
actual <- normalizeValue gottenGroup1.json
expected `shouldMatch` actual

-- Test filter (get in bulk) SCIM groups
-- 1. Match "group", results in finding all three groups created above.
filterScimUserGroup OwnDomain tok (Just "displayName co \"group\"") `bindResponse` \allThreeResp ->
(allThreeResp.json %. "Resources" & asList) `shouldMatchSet` [createdGroup1, createdGroup2, createdGroup3]
filterScimUserGroup OwnDomain tok (Just "displayName co \"group\"") `bindResponse` \allThreeResp -> do
resources <- (allThreeResp.json %. "Resources" & asList) >>= mapM normalizeValue
expected <- mapM normalizeValue [createdGroup1, createdGroup2, createdGroup3]
resources `shouldMatchSet` expected

-- 2. Match "another group", results in finding "another group" and "yet another group".
filterScimUserGroup OwnDomain tok (Just "displayName co \"another group\"") `bindResponse` \justTwo ->
(justTwo.json %. "Resources" & asList) `shouldMatchSet` [createdGroup2, createdGroup3]
filterScimUserGroup OwnDomain tok (Just "displayName co \"another group\"") `bindResponse` \justTwo -> do
resources <- (justTwo.json %. "Resources" & asList) >>= mapM normalizeValue
expected <- mapM normalizeValue [createdGroup2, createdGroup3]
resources `shouldMatchSet` expected

-- 3. Empty groups should have empty member list.
respGroup4 <- createScimUserGroup OwnDomain tok $ mkScimGroup "empty group" []
Expand Down Expand Up @@ -623,6 +631,20 @@ testSparScimUpdateUserGroup = do
memberValues <- (resp.json %. "members") >>= asListOf (\m -> m %. "value" >>= asString)
memberValues `shouldMatchSet` [charlieId, dianaId]

-- | Normalize on `Value` level
--
-- Recursively sorts all JSON arrays. This produces a canonical form, where the
-- initial order of elements doesn't matter. Only use this function when that's
-- desired (i.e. there is no value in the order of elements).
normalizeValue :: (MakesValue a) => a -> App A.Value
normalizeValue a = normalizeValueArrays <$> make a
where
normalizeValueArrays :: A.Value -> A.Value
normalizeValueArrays (A.Object o) = A.Object (normalizeValueArrays <$> o)
normalizeValueArrays (A.Array arr) =
A.Array . V.fromList . sort $ V.toList (normalizeValueArrays <$> arr)
normalizeValueArrays v = v

testSparScimUpdateUserGroupRejectsInvalidMembers :: (HasCallStack) => App ()
testSparScimUpdateUserGroupRejectsInvalidMembers = do
(alice, tid1, []) <- createTeam OwnDomain 1
Expand Down