yesod-test 1.5.6 → 1.5.7

raw patch · 5 files changed

+69/−9 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

+ Yesod.Test: clickOn :: Yesod site => Query -> YesodExample site ()

+ Yesod.Test.TransversingCSS: findAttributeBySelector :: HtmlLBS -> Query -> Text -> Either String [[Text]]

Files

ChangeLog.md +5/−0
Yesod/Test.hs +20/−0
Yesod/Test/TransversingCSS.hs +30/−8
test/main.hs +13/−0
yesod-test.cabal +1/−1

ChangeLog.md view

@@ -1,3 +1,8 @@+## 1.5.7++* Add clickOn.+[#1408](https://github.com/yesodweb/yesod/pull/1408)+ ## 1.5.6  * Add assertNotEq.

Yesod/Test.hs view

@@ -62,6 +62,7 @@     , setRequestBody     , RequestBuilder     , setUrl+    , clickOn      -- *** Adding fields by label     -- | Yesod can auto generate field names, so you are never sure what@@ -829,6 +830,25 @@                 x -> x         , rbdGets = rbdGets rbd ++ H.parseQuery (TE.encodeUtf8 urlQuery)         }+++-- | Click on a link defined by a CSS query+--+-- ==== __ Examples__+--+-- > get "/foobar"+-- > clickOn "a#idofthelink"+--+-- @since 1.5.7 +clickOn :: Yesod site => Query -> YesodExample site ()+clickOn query = do+  withResponse' yedResponse ["Tried to invoke clickOn in order to read HTML of a previous response."] $ \ res ->+    case findAttributeBySelector (simpleBody res) query "href" of+      Left err -> failure $ query <> " did not parse: " <> T.pack (show err)+      Right [[match]] -> get match+      Right matches -> failure $ "Expected exactly one match for clickOn: got " <> T.pack (show matches)++  -- | Simple way to set HTTP request body --

Yesod/Test/TransversingCSS.hs view

@@ -10,23 +10,24 @@ Only a subset of the CSS spec is currently supported:   * By tag name: /table td a/- +  * By class names: /.container .content/   * By Id: /#oneId/   * By attribute: /[hasIt]/, /[exact=match]/, /[contains*=text]/, /[starts^=with]/, /[ends$=with]/- +  * Union: /a, span, p/- - * Immediate children: /div > p/  + * Immediate children: /div > p/+  * Get jiggy with it: /div[data-attr=yeah] > .mon, .foo.bar div, #oneThing/  -}  module Yesod.Test.TransversingCSS (   findBySelector,+  findAttributeBySelector,   HtmlLBS,   Query,   -- * For HXT hackers@@ -41,7 +42,7 @@  import Yesod.Test.CssQuery import qualified Data.Text as T-import Control.Applicative ((<$>), (<*>))+import qualified Control.Applicative import Text.XML import Text.XML.Cursor import qualified Data.ByteString.Lazy as L@@ -58,9 +59,30 @@ -- -- * Right: List of matching Html fragments. findBySelector :: HtmlLBS -> Query -> Either String [String]-findBySelector html query = (\x -> map (renderHtml . toHtml . node) . runQuery x)-    Control.Applicative.<$> (Right $ fromDocument $ HD.parseLBS html)-    Control.Applicative.<*> parseQuery query+findBySelector html query =+  map (renderHtml . toHtml . node) Control.Applicative.<$> findCursorsBySelector html query++-- | Perform a css 'Query' on 'Html'. Returns Either+--+-- * Left: Query parse error.+--+-- * Right: List of matching Cursors+findCursorsBySelector :: HtmlLBS -> Query -> Either String [Cursor]+findCursorsBySelector html query =+  runQuery (fromDocument $ HD.parseLBS html)+       Control.Applicative.<$> parseQuery query++-- | Perform a css 'Query' on 'Html'. Returns Either+--+-- * Left: Query parse error.+--+-- * Right: List of matching Cursors+--+-- @since 1.5.7+findAttributeBySelector :: HtmlLBS -> Query -> T.Text -> Either String [[T.Text]]+findAttributeBySelector html query attr =+  map (laxAttribute attr) Control.Applicative.<$> findCursorsBySelector html query+  -- Run a compiled query on Html, returning a list of matching Html fragments. runQuery :: Cursor -> [[SelectorGroup]] -> [Cursor]

test/main.hs view

@@ -34,6 +34,7 @@ import qualified Data.Map as Map import qualified Text.HTML.DOM as HD import Network.HTTP.Types.Status (status301, status303, unsupportedMediaType415)+import Control.Exception.Lifted(SomeException, try)  parseQuery_ :: Text -> [[SelectorGroup]] parseQuery_ = either error id . parseQuery@@ -169,7 +170,17 @@                     addToken_ "body"                 statusIs 200                 bodyEquals "12345"+            yit "can follow a link via clickOn" $ do+              get ("/htmlWithLink" :: Text)+              clickOn "a#thelink"+              statusIs 200+              bodyEquals "<html><head><title>Hello</title></head><body><p>Hello World</p><p>Hello Moon</p></body></html>" +              get ("/htmlWithLink" :: Text)+              (bad :: Either SomeException ()) <- try (clickOn "a#nonexistentlink")+              assertEq "bad link" (isLeft bad) True++         ydescribe "utf8 paths" $ do             yit "from path" $ do                 get ("/dynamic1/שלום" :: Text)@@ -326,6 +337,8 @@     onStatic "html" $ dispatchTo $         return ("<html><head><title>Hello</title></head><body><p>Hello World</p><p>Hello Moon</p></body></html>" :: Text) +    onStatic "htmlWithLink" $ dispatchTo $+        return ("<html><head><title>A link</title></head><body><a href=\"/html\" id=\"thelink\">Link!</a></body></html>" :: Text)     onStatic "labels" $ dispatchTo $         return ("<html><label><input type='checkbox' name='fooname' id='foobar'>Foo Bar</label></html>" :: Text)

yesod-test.cabal view

@@ -1,5 +1,5 @@ name:               yesod-test-version:            1.5.6+version:            1.5.7 license:            MIT license-file:       LICENSE author:             Nubis <nubis@woobiz.com.ar>