Skip to content

Commit 7c806a2

Browse files
wolfgangwaltherwolfgangwalther
committed
test(spec): move two tests with basic config into list
Everything that uses withApp is in that list.
1 parent c2d32be commit 7c806a2

1 file changed

Lines changed: 32 additions & 37 deletions

File tree

‎test/spec/Main.hs‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -133,36 +133,38 @@ main = do
133133

134134

135135
let specs = uncurry describe <$> [
136-
("Feature.Auth.AudienceJwtSecretSpec" , Feature.Auth.AudienceJwtSecretSpec.disabledSpec)
137-
, ("Feature.Auth.AuthSpec" , Feature.Auth.AuthSpec.spec)
138-
, ("Feature.ConcurrentSpec" , Feature.ConcurrentSpec.spec)
139-
, ("Feature.CorsSpec" , Feature.CorsSpec.spec)
140-
, ("Feature.CustomMediaSpec" , Feature.Query.CustomMediaSpec.spec)
141-
, ("Feature.NoSuperuserSpec" , Feature.NoSuperuserSpec.spec)
142-
, ("Feature.OpenApi.OpenApiSpec" , Feature.OpenApi.OpenApiSpec.spec)
143-
, ("Feature.OptionsSpec" , Feature.OptionsSpec.spec)
144-
, ("Feature.Query.AndOrParamsSpec" , Feature.Query.AndOrParamsSpec.spec)
145-
, ("Feature.Query.ComputedRelsSpec" , Feature.Query.ComputedRelsSpec.spec)
146-
, ("Feature.Query.DeleteSpec" , Feature.Query.DeleteSpec.spec)
147-
, ("Feature.Query.EmbedDisambiguationSpec" , Feature.Query.EmbedDisambiguationSpec.spec)
148-
, ("Feature.Query.EmbedInnerJoinSpec" , Feature.Query.EmbedInnerJoinSpec.spec)
149-
, ("Feature.Query.InsertSpec" , Feature.Query.InsertSpec.spec)
150-
, ("Feature.Query.JsonOperatorSpec" , Feature.Query.JsonOperatorSpec.spec)
151-
, ("Feature.Query.NullsStripSpec" , Feature.Query.NullsStripSpec.spec)
152-
, ("Feature.Query.PgErrorCodeMappingSpec" , Feature.Query.ErrorSpec.pgErrorCodeMapping)
153-
, ("Feature.Query.PgSafeUpdateSpec.disabledSpec" , Feature.Query.PgSafeUpdateSpec.disabledSpec)
154-
, ("Feature.Query.PlanSpec.disabledSpec" , Feature.Query.PlanSpec.disabledSpec)
155-
, ("Feature.Query.Preferences.HandlingSpec" , Feature.Query.Preferences.HandlingSpec.spec)
156-
, ("Feature.Query.Preferences.MaxAffectedSpec" , Feature.Query.Preferences.MaxAffectedSpec.spec)
157-
, ("Feature.Query.QuerySpec" , Feature.Query.QuerySpec.spec)
158-
, ("Feature.Query.RangeSpec" , Feature.Query.RangeSpec.spec)
159-
, ("Feature.Query.RawOutputTypesSpec" , Feature.Query.RawOutputTypesSpec.spec)
160-
, ("Feature.Query.RelatedQueriesSpec" , Feature.Query.RelatedQueriesSpec.spec)
161-
, ("Feature.Query.RpcSpec" , Feature.Query.RpcSpec.spec actualPgVersion)
162-
, ("Feature.Query.SingularSpec" , Feature.Query.SingularSpec.spec)
163-
, ("Feature.Query.SpreadQueriesSpec" , Feature.Query.SpreadQueriesSpec.spec)
164-
, ("Feature.Query.UpdateSpec" , Feature.Query.UpdateSpec.spec)
165-
, ("Feature.Query.UpsertSpec" , Feature.Query.UpsertSpec.spec)
136+
("Feature.Auth.AudienceJwtSecretSpec" , Feature.Auth.AudienceJwtSecretSpec.disabledSpec)
137+
, ("Feature.Auth.AuthSpec" , Feature.Auth.AuthSpec.spec)
138+
, ("Feature.ConcurrentSpec" , Feature.ConcurrentSpec.spec)
139+
, ("Feature.CorsSpec" , Feature.CorsSpec.spec)
140+
, ("Feature.CustomMediaSpec" , Feature.Query.CustomMediaSpec.spec)
141+
, ("Feature.NoSuperuserSpec" , Feature.NoSuperuserSpec.spec)
142+
, ("Feature.OpenApi.OpenApiSpec" , Feature.OpenApi.OpenApiSpec.spec)
143+
, ("Feature.OptionsSpec" , Feature.OptionsSpec.spec)
144+
, ("Feature.Query.AggregateFunctionsSpec.disallowed" , Feature.Query.AggregateFunctionsSpec.disallowed)
145+
, ("Feature.Query.AndOrParamsSpec" , Feature.Query.AndOrParamsSpec.spec)
146+
, ("Feature.Query.ComputedRelsSpec" , Feature.Query.ComputedRelsSpec.spec)
147+
, ("Feature.Query.DeleteSpec" , Feature.Query.DeleteSpec.spec)
148+
, ("Feature.Query.EmbedDisambiguationSpec" , Feature.Query.EmbedDisambiguationSpec.spec)
149+
, ("Feature.Query.EmbedInnerJoinSpec" , Feature.Query.EmbedInnerJoinSpec.spec)
150+
, ("Feature.Query.InsertSpec" , Feature.Query.InsertSpec.spec)
151+
, ("Feature.Query.JsonOperatorSpec" , Feature.Query.JsonOperatorSpec.spec)
152+
, ("Feature.Query.NullsStripSpec" , Feature.Query.NullsStripSpec.spec)
153+
, ("Feature.Query.PgErrorCodeMappingSpec" , Feature.Query.ErrorSpec.pgErrorCodeMapping)
154+
, ("Feature.Query.PgSafeUpdateSpec.disabledSpec" , Feature.Query.PgSafeUpdateSpec.disabledSpec)
155+
, ("Feature.Query.PlanSpec.disabledSpec" , Feature.Query.PlanSpec.disabledSpec)
156+
, ("Feature.Query.Preferences.HandlingSpec" , Feature.Query.Preferences.HandlingSpec.spec)
157+
, ("Feature.Query.Preferences.MaxAffectedSpec" , Feature.Query.Preferences.MaxAffectedSpec.spec)
158+
, ("Feature.Query.Preferences.TimezoneSpec.enabledSpec", Feature.Query.Preferences.TimezoneSpec.enabledSpec)
159+
, ("Feature.Query.QuerySpec" , Feature.Query.QuerySpec.spec)
160+
, ("Feature.Query.RangeSpec" , Feature.Query.RangeSpec.spec)
161+
, ("Feature.Query.RawOutputTypesSpec" , Feature.Query.RawOutputTypesSpec.spec)
162+
, ("Feature.Query.RelatedQueriesSpec" , Feature.Query.RelatedQueriesSpec.spec)
163+
, ("Feature.Query.RpcSpec" , Feature.Query.RpcSpec.spec actualPgVersion)
164+
, ("Feature.Query.SingularSpec" , Feature.Query.SingularSpec.spec)
165+
, ("Feature.Query.SpreadQueriesSpec" , Feature.Query.SpreadQueriesSpec.spec)
166+
, ("Feature.Query.UpdateSpec" , Feature.Query.UpdateSpec.spec)
167+
, ("Feature.Query.UpsertSpec" , Feature.Query.UpsertSpec.spec)
166168
]
167169

168170
hspec $ do
@@ -247,13 +249,6 @@ main = do
247249
parallel $ before aggregatesEnabled $
248250
describe "Feature.Query.AggregateFunctionsSpec" Feature.Query.AggregateFunctionsSpec.allowed
249251

250-
parallel $ before withApp $
251-
describe "Feature.Query.AggregateFunctionsDisallowedSpec." Feature.Query.AggregateFunctionsSpec.disallowed
252-
253-
-- this test runs with db-timezone-enabled = true
254-
parallel $ before withApp $
255-
describe "Feature.Query.Preferences.TimezoneSpec.enabledSpec" Feature.Query.Preferences.TimezoneSpec.enabledSpec
256-
257252
-- this test runs with db-timezone-enabled = false
258253
parallel $ before timezoneDisabled $
259254
describe "Feature.Query.Preferences.TimezoneSpec.disabledSpec" Feature.Query.Preferences.TimezoneSpec.disabledSpec

0 commit comments

Comments
 (0)