Skip to content

Commit b99c0b9

Browse files
committed
Fixed golden tests after merge conflict.
1 parent e4a442a commit b99c0b9

File tree

1 file changed

+24
-20
lines changed

1 file changed

+24
-20
lines changed
Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# LANGUAGE OverloadedLists #-}
2+
{-# OPTIONS_GHC -Wno-deferred-out-of-scope-variables #-}
23

34
-- This file is part of the Wire Server implementation.
45
--
@@ -21,61 +22,64 @@ module Test.Wire.API.Golden.Generated.WithStatusPatch_team where
2122

2223
import Data.Domain
2324
import Imports
24-
import Wire.API.Team.Feature
25+
import Wire.API.Team.Feature hiding (withStatus)
2526

2627
testObject_WithStatusPatch_team_1 :: WithStatusPatch AppLockConfig
27-
testObject_WithStatusPatch_team_1 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just (AppLockConfig (EnforceAppLock False) (-98)))
28+
testObject_WithStatusPatch_team_1 = withStatus (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just (AppLockConfig (EnforceAppLock False) (-98)))
2829

2930
testObject_WithStatusPatch_team_2 :: WithStatusPatch AppLockConfig
30-
testObject_WithStatusPatch_team_2 = withStatus' Nothing Nothing (Just (AppLockConfig (EnforceAppLock True) 0))
31+
testObject_WithStatusPatch_team_2 = withStatus Nothing Nothing (Just (AppLockConfig (EnforceAppLock True) 0))
3132

3233
testObject_WithStatusPatch_team_3 :: WithStatusPatch AppLockConfig
33-
testObject_WithStatusPatch_team_3 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just (AppLockConfig (EnforceAppLock True) 111))
34+
testObject_WithStatusPatch_team_3 = withStatus (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just (AppLockConfig (EnforceAppLock True) 111))
3435

3536
testObject_WithStatusPatch_team_4 :: WithStatusPatch SelfDeletingMessagesConfig
36-
testObject_WithStatusPatch_team_4 = withStatus' (Just FeatureStatusEnabled) Nothing (Just (SelfDeletingMessagesConfig (-97)))
37+
testObject_WithStatusPatch_team_4 = withStatus (Just FeatureStatusEnabled) Nothing (Just (SelfDeletingMessagesConfig (-97)))
3738

3839
testObject_WithStatusPatch_team_5 :: WithStatusPatch SelfDeletingMessagesConfig
39-
testObject_WithStatusPatch_team_5 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just (SelfDeletingMessagesConfig 0))
40+
testObject_WithStatusPatch_team_5 = withStatus (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just (SelfDeletingMessagesConfig 0))
4041

4142
testObject_WithStatusPatch_team_6 :: WithStatusPatch SelfDeletingMessagesConfig
42-
testObject_WithStatusPatch_team_6 = withStatus' (Just FeatureStatusEnabled) Nothing (Just (SelfDeletingMessagesConfig 77))
43+
testObject_WithStatusPatch_team_6 = withStatus (Just FeatureStatusEnabled) Nothing (Just (SelfDeletingMessagesConfig 77))
4344

4445
testObject_WithStatusPatch_team_7 :: WithStatusPatch ClassifiedDomainsConfig
45-
testObject_WithStatusPatch_team_7 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just (ClassifiedDomainsConfig []))
46+
testObject_WithStatusPatch_team_7 = withStatus (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just (ClassifiedDomainsConfig []))
4647

4748
testObject_WithStatusPatch_team_8 :: WithStatusPatch ClassifiedDomainsConfig
48-
testObject_WithStatusPatch_team_8 = withStatus' Nothing (Just LockStatusLocked) (Just (ClassifiedDomainsConfig [Domain "example.com", Domain "test.foobar"]))
49+
testObject_WithStatusPatch_team_8 = withStatus Nothing (Just LockStatusLocked) (Just (ClassifiedDomainsConfig [Domain "example.com", Domain "test.foobar"]))
4950

5051
testObject_WithStatusPatch_team_9 :: WithStatusPatch ClassifiedDomainsConfig
51-
testObject_WithStatusPatch_team_9 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just (ClassifiedDomainsConfig [Domain "test.foobar"]))
52+
testObject_WithStatusPatch_team_9 = withStatus (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just (ClassifiedDomainsConfig [Domain "test.foobar"]))
5253

5354
testObject_WithStatusPatch_team_10 :: WithStatusPatch SSOConfig
54-
testObject_WithStatusPatch_team_10 = withStatus' (Just FeatureStatusDisabled) (Just LockStatusLocked) (Just SSOConfig)
55+
testObject_WithStatusPatch_team_10 = withStatus (Just FeatureStatusDisabled) (Just LockStatusLocked) (Just SSOConfig)
5556

5657
testObject_WithStatusPatch_team_11 :: WithStatusPatch SearchVisibilityAvailableConfig
57-
testObject_WithStatusPatch_team_11 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just SearchVisibilityAvailableConfig)
58+
testObject_WithStatusPatch_team_11 = withStatus (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just SearchVisibilityAvailableConfig)
5859

5960
testObject_WithStatusPatch_team_12 :: WithStatusPatch ValidateSAMLEmailsConfig
60-
testObject_WithStatusPatch_team_12 = withStatus' (Just FeatureStatusDisabled) Nothing (Just ValidateSAMLEmailsConfig)
61+
testObject_WithStatusPatch_team_12 = withStatus (Just FeatureStatusDisabled) Nothing (Just ValidateSAMLEmailsConfig)
6162

6263
testObject_WithStatusPatch_team_13 :: WithStatusPatch DigitalSignaturesConfig
63-
testObject_WithStatusPatch_team_13 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just DigitalSignaturesConfig)
64+
testObject_WithStatusPatch_team_13 = withStatus (Just FeatureStatusEnabled) (Just LockStatusLocked) (Just DigitalSignaturesConfig)
6465

6566
testObject_WithStatusPatch_team_14 :: WithStatusPatch ConferenceCallingConfig
66-
testObject_WithStatusPatch_team_14 = withStatus' Nothing (Just LockStatusUnlocked) (Just ConferenceCallingConfig)
67+
testObject_WithStatusPatch_team_14 = withStatus Nothing (Just LockStatusUnlocked) (Just ConferenceCallingConfig)
6768

6869
testObject_WithStatusPatch_team_15 :: WithStatusPatch GuestLinksConfig
69-
testObject_WithStatusPatch_team_15 = withStatus' (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just GuestLinksConfig)
70+
testObject_WithStatusPatch_team_15 = withStatus (Just FeatureStatusEnabled) (Just LockStatusUnlocked) (Just GuestLinksConfig)
7071

7172
testObject_WithStatusPatch_team_16 :: WithStatusPatch SndFactorPasswordChallengeConfig
72-
testObject_WithStatusPatch_team_16 = withStatus' (Just FeatureStatusDisabled) (Just LockStatusUnlocked) (Just SndFactorPasswordChallengeConfig)
73+
testObject_WithStatusPatch_team_16 = withStatus (Just FeatureStatusDisabled) (Just LockStatusUnlocked) (Just SndFactorPasswordChallengeConfig)
7374

7475
testObject_WithStatusPatch_team_17 :: WithStatusPatch SearchVisibilityInboundConfig
75-
testObject_WithStatusPatch_team_17 = withStatus' (Just FeatureStatusEnabled) Nothing (Just SearchVisibilityInboundConfig)
76+
testObject_WithStatusPatch_team_17 = withStatus (Just FeatureStatusEnabled) Nothing (Just SearchVisibilityInboundConfig)
7677

7778
testObject_WithStatusPatch_team_18 :: WithStatusPatch GuestLinksConfig
78-
testObject_WithStatusPatch_team_18 = withStatus' (Just FeatureStatusEnabled) Nothing Nothing
79+
testObject_WithStatusPatch_team_18 = withStatus (Just FeatureStatusEnabled) Nothing Nothing
7980

8081
testObject_WithStatusPatch_team_19 :: WithStatusPatch SelfDeletingMessagesConfig
81-
testObject_WithStatusPatch_team_19 = withStatus' Nothing (Just LockStatusUnlocked) Nothing
82+
testObject_WithStatusPatch_team_19 = withStatus Nothing (Just LockStatusUnlocked) Nothing
83+
84+
withStatus :: Maybe FeatureStatus -> Maybe LockStatus -> Maybe cfg -> WithStatusPatch cfg
85+
withStatus fs ls cfg = withStatus' fs ls cfg Nothing

0 commit comments

Comments
 (0)