Removed Yesod.Internal.TestApi

yesod-core/Yesod/Core/Internal/Request.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
-module Yesod.Internal.Request
+module Yesod.Core.Internal.Request
     ( parseWaiRequest
     , RequestBodyContents
     , FileInfo

yesod-core/Yesod/Core/Run.hs

@@ -43,7 +43,7 @@ import           Web.Cookie                   (renderSetCookie)
 import           Yesod.Content
 import           Yesod.Core.Class
 import           Yesod.Core.Types
-import           Yesod.Internal.Request       (parseWaiRequest, tokenKey,
+import           Yesod.Core.Internal.Request  (parseWaiRequest, tokenKey,
                                                tooLargeResponse)
 import           Yesod.Routes.Class           (Route, renderRoute)
 

yesod-core/Yesod/Handler.hs

@@ -129,7 +129,7 @@ module Yesod.Handler
     ) where
 
 import Prelude hiding (catch)
-import Yesod.Internal.Request
+import Yesod.Core.Internal.Request
 import Data.Time (UTCTime, getCurrentTime, addUTCTime)
 
 import Control.Exception hiding (Handler, catch, finally)

yesod-core/Yesod/Internal/Core.hs

@@ -47,7 +47,7 @@ import Yesod.Routes.Class
 
 import qualified Network.Wai as W
 import Yesod.Internal.Session
-import Yesod.Internal.Request
+import Yesod.Core.Internal.Request
 import Data.Text (Text)
 import qualified Paths_yesod_core
 import Data.Version (showVersion)

yesod-core/Yesod/Internal/TestApi.hs

@@ -1,11 +0,0 @@
---
--- | WARNING: This module exposes internal interfaces solely for the
--- purpose of facilitating cabal-driven testing of said interfaces.
--- This module is NOT part of the public Yesod API and should NOT be
--- imported by library users.
---
-module Yesod.Internal.TestApi
-  ( randomString, parseWaiRequest
-  ) where
-
-import Yesod.Internal.Request (randomString, parseWaiRequest)

yesod-core/test/YesodCoreTest/InternalRequest.hs

@@ -6,7 +6,7 @@ import System.Random (StdGen, mkStdGen)
 
 import Network.Wai as W
 import Network.Wai.Test
-import Yesod.Internal.TestApi (randomString, parseWaiRequest)
+import Yesod.Core.Internal.Request (randomString, parseWaiRequest)
 import Test.Hspec
 import Data.Monoid (mempty)
 import Data.Map (singleton)

yesod-core/yesod-core.cabal

@@ -94,10 +94,9 @@ library
                      Yesod.Dispatch
                      Yesod.Handler
                      Yesod.Widget
-                     Yesod.Internal.TestApi
+                     Yesod.Core.Internal.Request
     other-modules:   Yesod.Internal.Core
                      Yesod.Internal.Session
-                     Yesod.Internal.Request
                      Yesod.Core.Time
                      Yesod.Core.Trans.Class
                      Yesod.Core.Run