Merge pull request #288 from scotty-web/fix-windows-build

Fix a Windows build error in the test suite
scotty-web · Nov 17, 2022 · ff4fa83 · ff4fa83
2 parents 3d56d73 + 89a38f8
commit ff4fa83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 ## next [????.??.??]
+
+## 0.12.1 [2022.11.17]
+* Fix CPP bug that prevented tests from building on Windows.
 * Allow building with `transformers-0.6.*` and `mtl-2.3.*`. Because the
   `MonadTrans t` class gained a `forall m. Monad m => Monad (t m)` superclass
   in `transformers-0.6.0.0`, the `MonadTrans` and `MonadTransControl` instances

diff --git a/scotty.cabal b/scotty.cabal
@@ -1,5 +1,5 @@
 Name:                scotty
-Version:             0.12
+Version:             0.12.1
 Synopsis:            Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp
 Homepage:            https://github.com/scotty-web/scotty
 Bug-reports:         https://github.com/scotty-web/scotty/issues

diff --git a/test/Web/ScottySpec.hs b/test/Web/ScottySpec.hs
@@ -36,6 +36,7 @@ availableMethods = [GET, POST, HEAD, PUT, PATCH, DELETE, OPTIONS]
 
 spec :: Spec
 spec = do
+  let withApp = with . scottyApp
   describe "ScottyM" $ do
     forM_ [
         ("GET", Scotty.get, get)
@@ -186,8 +187,6 @@ spec = do
         ok = "HTTP/1.1 200 OK"
         no = "HTTP/1.1 404 Not Found"
 
-        withApp = with . scottyApp
-
 socketPath :: FilePath
 socketPath = "/tmp/scotty-test.socket"