ghc78 compat

haskell-servant · Sep 21, 2017 · 927c5b9 · hvr · Sep 21, 2017 · imalsogreg
1 parent 9dad9c0
commit 927c5b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Servant/Server/Internal/Context.hs b/src/Servant/Server/Internal/Context.hs
@@ -1,9 +1,14 @@
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE GADTs                      #-}
 {-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
+#if __GLASGOW_HASKELL__ < 710
+{-# LANGUAGE OverlappingInstances       #-}
+#endif
+{-# LANGUAGE OverlappingInstances       #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TypeOperators              #-}
 
@@ -99,4 +104,4 @@ descendIntoNamedContext :: forall context name subContext .
   Proxy (name :: Symbol) -> Context context -> Context subContext
 descendIntoNamedContext Proxy context =
   let NamedContext subContext = getContextEntry context :: NamedContext name subContext
-  in subContext
+  in subContext
diff --git a/test/Servant/ServerSpec.hs b/test/Servant/ServerSpec.hs
@@ -768,7 +768,7 @@ basicAuthSpec = do
 
   describe "Checks auth" $ do
 
-    it "returns 403 when not logged  in" $ do
+    it "returns 401 when not logged  in" $ do
       response <- runReqOnApi baApi (baCheck :. EmptyContext) getSecret SC.GET "/secret" "" [] ""
       response `shouldHaveStatus` 401