curl-runnings 0.10.0 → 0.11.0

raw patch · 3 files changed

+20/−21 lines, 3 filesdep −http-typesdep ~http-conduitdep ~megaparsec

Dependencies removed: http-types

Dependency ranges changed: http-conduit, megaparsec

Files

• curl-runnings.cabal +15/−16
• src/Testing/CurlRunnings.hs +2/−2
• src/Testing/CurlRunnings/Internal/Parser.hs +3/−3

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: e7cff7f0f8e0a24c815714efc642a28f90928aa4c4dc7cc5743c8bfb9ece772c+-- hash: b7f43a448b7bffd8bc3340f6483fb99f6391934bc869150ced8021708ca83864  name:           curl-runnings-version:        0.10.0+version:        0.11.0 synopsis:       A framework for declaratively writing curl based API tests description:    Please see the README on Github at <https://github.com/aviaviavi/curl-runnings#readme> category:       Testing@@ -31,6 +31,13 @@   location: https://github.com/aviaviavi/curl-runnings  library+  exposed-modules:+      Testing.CurlRunnings+      Testing.CurlRunnings.Types+      Testing.CurlRunnings.Internal+      Testing.CurlRunnings.Internal.Parser+  other-modules:+      Paths_curl_runnings   hs-source-dirs:       src   build-depends:@@ -43,26 +50,20 @@     , hspec >=2.4.4     , hspec-expectations >=0.8.2     , http-client-tls >=0.3.5.3-    , http-conduit >=2.2.4-    , http-types >=0.9.1-    , megaparsec >=6.3.0+    , http-conduit >=2.3.6+    , megaparsec >=7.0.4     , pretty-simple >=2.0.2.1     , regex-posix >=0.95.2     , text >=1.2.2.2     , unordered-containers >=0.2.8.0     , vector >=0.12.0     , yaml >=0.8.28-  exposed-modules:-      Testing.CurlRunnings-      Testing.CurlRunnings.Types-      Testing.CurlRunnings.Internal-      Testing.CurlRunnings.Internal.Parser-  other-modules:-      Paths_curl_runnings   default-language: Haskell2010  executable curl-runnings   main-is: Main.hs+  other-modules:+      Paths_curl_runnings   hs-source-dirs:       app   ghc-options: -threaded -rtsopts -with-rtsopts=-N@@ -77,13 +78,13 @@     , tar >=0.5.0.3     , text >=1.2.2.2     , zlib >=0.6.1.2-  other-modules:-      Paths_curl_runnings   default-language: Haskell2010  test-suite curl-runnings-test   type: exitcode-stdio-1.0   main-is: Spec.hs+  other-modules:+      Paths_curl_runnings   hs-source-dirs:       test   ghc-options: -threaded -rtsopts -with-rtsopts=-N@@ -93,6 +94,4 @@     , directory >=1.3.0.2     , hspec >=2.4.4     , hspec-expectations >=0.8.2-  other-modules:-      Paths_curl_runnings   default-language: Haskell2010

@@ -27,8 +27,8 @@ import           Network.Connection                   (TLSSettings (..)) import           Network.HTTP.Client.TLS              (mkManagerSettings) import           Network.HTTP.Conduit-import           Network.HTTP.Simple-import qualified Network.HTTP.Types.Header            as HTTP+import           Network.HTTP.Simple                  hiding (Header)+import qualified Network.HTTP.Simple                  as HTTP import           System.Directory import           System.Environment import           Testing.CurlRunnings.Internal

@@ -48,7 +48,7 @@   let trimmed = T.strip q   in case Text.Megaparsec.parse parseFullTextWithQuery "" trimmed of        Right a -> Right a >>= validateQuery-       Left a -> Left $ QueryParseError (T.pack $ parseErrorPretty a) q+       Left a -> Left $ QueryParseError (T.pack $ errorBundlePretty a) q  -- | Once we have parsed a query successfully, ensure that it is a legal query validateQuery :: [InterpolatedQuery] -> Either QueryError [InterpolatedQuery]@@ -137,11 +137,11 @@   else return $ InterpolatedQuery (T.pack text) q  leadingText :: Parser String-leadingText = manyTill anyChar $ lookAhead (symbol "$<" <|> "${")+leadingText = manyTill anySingle $ lookAhead (symbol "$<" <|> "${")  noQueryText :: Parser InterpolatedQuery noQueryText = do-  str <- some anyChar+  str <- some anySingle   eof   if "$<" `isInfixOf` str     then fail "invalid `$<` found"