Fix integration test.

wireapp · Aug 7, 2019 · 875d833 · 875d833
1 parent dc12ddb
commit 875d833
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/services/spar/test-integration/Test/Spar/APISpec.hs b/services/spar/test-integration/Test/Spar/APISpec.hs
@@ -24,7 +24,6 @@ import Util.Types
 import qualified Data.ByteString.Builder as LB
 import qualified Data.ZAuth.Token as ZAuth
 import qualified Galley.Types.Teams as Galley
-import qualified Galley.Types.Teams.SSO as Galley
 import qualified Spar.Intra.Brig as Intra
 import qualified Util.Scim as ScimT
 import qualified Web.Cookie as Cky
@@ -608,8 +607,7 @@ specCRUDIdentityProvider = do
       context "sso disabled for team" $ do
         it "responds with 403 forbidden" $ do
           env <- ask
-          (uid, tid) <- call $ createUserWithTeam (env ^. teBrig) (env ^. teGalley)
-          call $ putSSOEnabledInternal (env ^. teGalley) tid Galley.SSODisabled
+          (uid, _tid) <- call $ createUserWithTeamDisableSSO (env ^. teBrig) (env ^. teGalley)
           (callIdpCreate' (env ^. teSpar) (Just uid) =<< makeTestIdPMetadata)
             `shouldRespondWith` checkErr (== 403) "sso-disabled"
 

diff --git a/services/spar/test-integration/Util/Core.hs b/services/spar/test-integration/Util/Core.hs
@@ -27,6 +27,7 @@ module Util.Core
   -- * Other
   , defPassword
   , createUserWithTeam
+  , createUserWithTeamDisableSSO
   , getSSOEnabledInternal
   , putSSOEnabledInternal
   , createTeamMember
@@ -227,6 +228,12 @@ aFewTimes action good = do
 
 createUserWithTeam :: (HasCallStack, MonadHttp m, MonadIO m) => BrigReq -> GalleyReq -> m (UserId, TeamId)
 createUserWithTeam brg gly = do
+    (uid, tid) <- createUserWithTeamDisableSSO brg gly
+    putSSOEnabledInternal gly tid Galley.SSOEnabled
+    pure (uid, tid)
+
+createUserWithTeamDisableSSO :: (HasCallStack, MonadHttp m, MonadIO m) => BrigReq -> GalleyReq -> m (UserId, TeamId)
+createUserWithTeamDisableSSO brg gly = do
     e <- randomEmail
     n <- UUID.toString <$> liftIO UUID.nextRandom
     let p = RequestBodyLBS . Aeson.encode $ object
@@ -243,7 +250,6 @@ createUserWithTeam brg gly = do
     selfTeam <- Brig.userTeam . Brig.selfUser <$> getSelfProfile brg uid
     () <- Control.Exception.assert {- "Team ID in self profile and team table do not match" -} (selfTeam == Just tid)
           $ pure ()
-    putSSOEnabledInternal gly tid Galley.SSOEnabled
     return (uid, tid)
 
 getSSOEnabledInternal :: (HasCallStack, MonadHttp m, MonadIO m) => GalleyReq -> TeamId -> m ResponseLBS