Skip to content

Bump hscim version / fix flaky test #1702

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
fisx merged 5 commits into from
Aug 12, 2021
Merged

Bump hscim version / fix flaky test #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d67ce10
bump hscim package version.
fisx Aug 10, 2021
f191f8e
Fix flaky unit test.
fisx Aug 10, 2021
0c70afa
Fix typo.
fisx Aug 10, 2021
8f1c621
hi ci
fisx Aug 11, 2021
682fe6c
hi ci
fisx Aug 11, 2021
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
2 changes: 1 addition & 1 deletion libs/hscim/hscim.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cabal-version: 1.12
-- hash: b8d0589f22bc168d16fa3a2b2800d9cc3b14b4d94bb911fe973ccf2a2025e5e5

name: hscim
version: 0.3.4
version: 0.3.5
synopsis: hscim json schema and server implementation
description: The README file will answer all the questions you might have
category: Web
Expand Down
2 changes: 1 addition & 1 deletion libs/hscim/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: hscim
version: 0.3.4
version: 0.3.5
synopsis: hscim json schema and server implementation
description: The README file will answer all the questions you might have
homepage: https://github.com/wireapp/wire-server/libs/hscim/README.md
Expand Down
6 changes: 3 additions & 3 deletions libs/hscim/src/Web/Scim/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module Web.Scim.Client
getUser,
postUser,
putUser,
patchUserr,
patchUser,
deleteUser,

-- * group
Expand Down Expand Up @@ -143,14 +143,14 @@ putUser ::
IO (StoredUser tag)
putUser env tok = case users (scimClients env) tok of ((_ :<|> (_ :<|> _)) :<|> (r :<|> (_ :<|> _))) -> r

patchUserr ::
patchUser ::
HasScimClient tag =>
ClientEnv ->
Maybe (AuthData tag) ->
UserId tag ->
PatchOp tag ->
IO (StoredUser tag)
patchUserr env tok = case users (scimClients env) tok of ((_ :<|> (_ :<|> _)) :<|> (_ :<|> (r :<|> _))) -> r
patchUser env tok = case users (scimClients env) tok of ((_ :<|> (_ :<|> _)) :<|> (_ :<|> (r :<|> _))) -> r

deleteUser ::
forall tag.
Expand Down
5 changes: 3 additions & 2 deletions libs/hscim/test/Test/Schema/MetaSchemaSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ prop_roundtrip gen = property $ do
spec :: Spec
spec = do
describe "MetaSchema" $ do
-- the extra 'decode' in the golden tests is to make attribute order not count for Eq.
it "`Supported ()` golden test" $ do
encode (Supported (ScimBool True) ()) `shouldBe` "{\"supported\":true}"
decode @Value (encode (Supported (ScimBool True) ())) `shouldBe` decode @Value ("{\"supported\":true}")
it "`Supported a` golden test" $ do
encode (Supported (ScimBool True) (FilterConfig 3)) `shouldBe` "{\"supported\":true,\"maxResults\":3}"
decode @Value (encode (Supported (ScimBool True) (FilterConfig 3))) `shouldBe` decode @Value "{\"supported\":true,\"maxResults\":3}"
it "`Supported ()` roundtrips" $ do
require (prop_roundtrip (genSupported (pure ())))
it "`BulkConfig` roundtrips" $ do
Expand Down