@@ -1,9 +1,11 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE StandaloneDeriving #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE UndecidableInstances #-}
2{-# LANGUAGE ConstraintKinds #-}
5{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE GADTs #-}
8{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7{-# LANGUAGE LambdaCase #-}
9{-# LANGUAGE LambdaCase #-}
8{-# LANGUAGE MultiParamTypeClasses #-}
10{-# LANGUAGE MultiParamTypeClasses #-}
9{-# LANGUAGE OverloadedStrings #-}
11{-# LANGUAGE OverloadedStrings #-}
@@ -11,44 +13,29 @@
11{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE RecursiveDo #-}
14{-# LANGUAGE RecursiveDo #-}
13{-# LANGUAGE ScopedTypeVariables #-}
15{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
15{-# LANGUAGE TemplateHaskell #-}
16{-# LANGUAGE TemplateHaskell #-}
16{-# LANGUAGE TupleSections #-}
17{-# LANGUAGE TupleSections #-}
17{-# LANGUAGE TypeApplications #-}
18{-# LANGUAGE TypeApplications #-}
18{-# LANGUAGE TypeFamilies #-}
19{-# LANGUAGE TypeFamilies #-}
19−{-# LANGUAGE UndecidableInstances #-}
21−{-# OPTIONS_GHC -fno-warn-orphans #-}
23−-- Notice to those working on this test suite:
24−-- It doesn't appear to be possible to use --match to run a particular test, in
25−-- this situation the test may hang before reaching our code. This seems to
26−-- happen when the test is not the first test in the block. As a workaround, you
27−-- can just comment out the other tests. Also, using `xit` will cause the same
28−-- issue. `xit` tests must be the last tests in the session, or the session will
29−-- hang in the following test.
31−import Prelude hiding (fail)
32import Control.Concurrent
21import Control.Concurrent
33−import qualified Control.Concurrent.Async as Async
34−import Control.Lens.Operators
35−import Control.Monad hiding (fail)
22+import Control.Monad
36import Control.Monad.Catch
23import Control.Monad.Catch
37−import Control.Monad.Fail
38import Control.Monad.Fix
24import Control.Monad.Fix
39import Control.Monad.IO.Class
25import Control.Monad.IO.Class
40import Control.Monad.Ref
26import Control.Monad.Ref
27+import Data.Constraint (Dict(..))
41import Data.Constraint.Extras
28import Data.Constraint.Extras
42import Data.Constraint.Extras.TH
29import Data.Constraint.Extras.TH
43import Data.Dependent.Map (DMap)
30import Data.Dependent.Map (DMap)
44−import Data.Dependent.Sum (DSum(..), (==>))
31+import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
32+import Data.Foldable (traverse_)
45import Data.Functor.Identity
33import Data.Functor.Identity
46import Data.Functor.Misc
34import Data.Functor.Misc
47import Data.GADT.Compare.TH
35import Data.GADT.Compare.TH
48import Data.GADT.Show.TH
36import Data.GADT.Show.TH
49import Data.IORef (IORef)
37import Data.IORef (IORef)
50−import Data.List (sort)
38+import Data.Maybe (fromMaybe, fromJust)
52import Data.Proxy
39import Data.Proxy
53import Data.Text (Text)
40import Data.Text (Text)
54import Language.Javascript.JSaddle (syncPoint, liftJSM)
41import Language.Javascript.JSaddle (syncPoint, liftJSM)
@@ -58,22 +45,18 @@ import Network.Socket
58import Network.Wai
45import Network.Wai
59import Network.WebSockets
46import Network.WebSockets
60import Reflex.Dom.Core
47import Reflex.Dom.Core
61−import Reflex.Dom.Widget.Input (dropdown)
62import Reflex.Patch.DMapWithMove
48import Reflex.Patch.DMapWithMove
63import System.Directory
49import System.Directory
64−import System.Environment
65import System.IO (stderr)
50import System.IO (stderr)
66import System.IO.Silently
51import System.IO.Silently
67import System.IO.Temp
52import System.IO.Temp
68import System.Process
53import System.Process
69−import System.Which (staticWhich)
54+import System.Timeout.Lifted
70−import qualified Test.HUnit as HUnit
55+import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
71import qualified Test.Hspec as H
56import qualified Test.Hspec as H
72−import qualified Test.Hspec.Core.Spec as H
73−import Test.Hspec (xit)
74−import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
57+import Test.Hspec.WebDriver hiding (runWD)
75import qualified Test.Hspec.WebDriver as WD
58import qualified Test.Hspec.WebDriver as WD
76−import Test.WebDriver (WD(..))
59+import Test.WebDriver (WD)
78import qualified Data.ByteString.Lazy as LBS
61import qualified Data.ByteString.Lazy as LBS
79import qualified Data.Dependent.Map as DMap
62import qualified Data.Dependent.Map as DMap
@@ -86,37 +69,20 @@ import qualified System.FilePath as FilePath
86import qualified Test.WebDriver as WD
69import qualified Test.WebDriver as WD
87import qualified Test.WebDriver.Capabilities as WD
70import qualified Test.WebDriver.Capabilities as WD
89−import Test.Util.ChromeFlags
90−import Test.Util.UnshareNetwork
92−-- ORPHAN: https://github.com/kallisti-dev/hs-webdriver/pull/167
93−deriving instance MonadMask WD
96−chromium = $(staticWhich "chromium")
98−seleniumPort, jsaddlePort :: PortNumber
102-- TODO Remove orphan
72-- TODO Remove orphan
103−instance MonadRef WD where
73+deriving instance MonadRef WD
104− type Ref WD = Ref IO
105− newRef = WD . newRef
106− readRef = WD . readRef
107− writeRef r = WD . writeRef r
109assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
75assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110−assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
76+assertEqual a b = liftIO . HUnit.assertEqual a b
112assertFailure :: MonadIO m => String -> m ()
78assertFailure :: MonadIO m => String -> m ()
113assertFailure = liftIO . HUnit.assertFailure
79assertFailure = liftIO . HUnit.assertFailure
115−assertBool :: (MonadIO m) => String -> Bool -> m ()
81+testTimeLimit :: Int
116−assertBool msg bool = liftIO $ HUnit.assertBool msg bool
82+testTimeLimit = 5 * 1000 * 1000
118−chromeConfig :: Text -> [Text] -> WD.WDConfig
84+chromeConfig :: Text -> WD.WDConfig
119−chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
85+chromeConfig fp = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = ["--headless"] }) WD.defaultConfig
121keyMap :: DMap DKey Identity
87keyMap :: DMap DKey Identity
122keyMap = DMap.fromList
88keyMap = DMap.fromList
@@ -141,38 +107,30 @@ deriveGEq ''DKey
141deriveGCompare ''DKey
107deriveGCompare ''DKey
142deriveGShow ''DKey
108deriveGShow ''DKey
144−deriving instance MonadFail WD
110+instance ShowTag DKey Identity where
111+ showTaggedPrec = \case
112+ Key_Int -> showsPrec
113+ Key_Char -> showsPrec
114+ Key_Bool -> showsPrec
116+instance EqTag DKey Identity where
117+ eqTagged Key_Int Key_Int = (==)
118+ eqTagged Key_Char Key_Char = (==)
119+ eqTagged Key_Bool Key_Bool = (==)
146main :: IO ()
121main :: IO ()
149− isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
150− withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
151− withSeleniumServer $ \selenium -> do
122+main = withSeleniumServer $ \selenium -> do
152− let browserPath = T.strip $ T.pack chromium
123+ browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
153− when (T.null browserPath) $ fail "No browser found"
124+ when (T.null browserPath) $ fail "No browser found"
154− withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
155− let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
125+ let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156− chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
126+ chromeCaps' = WD.getCaps $ chromeConfig browserPath
157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
127+ hspec (tests wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
129+tests :: WD.WDConfig -> [Capabilities] -> Selenium -> Spec
160−tests withDebugging wdConfig caps _selenium = do
130+tests wdConfig caps _selenium = do
161− let putStrLnDebug :: MonadIO m => Text -> m ()
162− putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163− session' t = sessionWith wdConfig t . using caps
131+ let session' = sessionWith wdConfig "" . using (map (,"") caps)
164− runWD m = runWDOptions (WdOptions False) $ do
132+ runWD = runWDOptions (WdOptions False)
165− putStrLnDebug "before"
133+ describe "text" $ session' $ do
167− putStrLnDebug "after"
169− testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170− testWidgetStatic = testWidgetStaticDebug withDebugging
171− testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172− testWidget = testWidgetDebug True withDebugging
173− testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
174− testWidget' = testWidgetDebug' True withDebugging
175− session' "text" $ do
176 it "works" $ runWD $ do
134 it "works" $ runWD $ do
177 testWidgetStatic (checkBodyText "hello world") $ do
135 testWidgetStatic (checkBodyText "hello world") $ do
178 text "hello world"
136 text "hello world"
@@ -227,25 +185,27 @@ tests withDebugging wdConfig caps _selenium = do
227 it "updates in immediate mode" $ runWD $ do
185 it "updates in immediate mode" $ runWD $ do
228 let checkUpdated = do
186 let checkUpdated = do
229 checkBodyText "initial"
187 checkBodyText "initial"
230− WD.click =<< findElemWithRetry (WD.ByTag "button")
188+ WD.click =<< WD.findElem (WD.ByTag "button")
189+ liftIO $ threadDelay 100000 -- wait for update
231 checkBodyText "after"
190 checkBodyText "after"
232 testWidget (pure ()) checkUpdated $ prerender_ (pure ()) $ do
191 testWidget (pure ()) checkUpdated $ prerender_ (pure ()) $ do
233 click <- button ""
192 click <- button ""
234 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
193 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
236− session' "element" $ do
195+ describe "element" $ session' $ do
237 it "works with domEvent Click" $ runWD $ do
196 it "works with domEvent Click" $ runWD $ do
238 clickedRef <- liftIO $ newRef False
197 clickedRef <- liftIO $ newRef False
239− testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
198+ testWidget' (WD.findElem $ WD.ByTag "div") WD.click $ do
240 (e, _) <- el' "div" $ text "hello world"
199 (e, _) <- el' "div" $ text "hello world"
241 performEvent_ $ liftIO (writeRef clickedRef True) <$ domEvent Click e
200 performEvent_ $ liftIO (writeRef clickedRef True) <$ domEvent Click e
242− readRef clickedRef `shouldBeWithRetryM` True
201+ clicked <- liftIO $ readRef clickedRef
202+ liftIO $ assertEqual "Not clicked" True clicked
243 it "works with eventFlags stopPropagation" $ runWD $ do
203 it "works with eventFlags stopPropagation" $ runWD $ do
244 firstClickedRef <- newRef False
204 firstClickedRef <- newRef False
245 secondClickedRef <- newRef False
205 secondClickedRef <- newRef False
246 let clickBoth = do
206 let clickBoth = do
247− findElemWithRetry (WD.ById "first") >>= WD.click
207+ WD.findElem (WD.ById "first") >>= WD.click
248− findElemWithRetry (WD.ById "second") >>= WD.click
208+ WD.findElem (WD.ById "second") >>= WD.click
249 testWidget (pure ()) clickBoth $ do
209 testWidget (pure ()) clickBoth $ do
250 (firstDivEl, _) <- el' "div" $ prerender_ (pure ()) $ do
210 (firstDivEl, _) <- el' "div" $ prerender_ (pure ()) $ do
251 void $ elAttr "span" ("id" =: "first") $ text "hello world"
211 void $ elAttr "span" ("id" =: "first") $ text "hello world"
@@ -262,7 +222,7 @@ tests withDebugging wdConfig caps _selenium = do
262 assertEqual "Click propagated when it should have stopped" (True, False) (firstClicked, secondClicked)
222 assertEqual "Click propagated when it should have stopped" (True, False) (firstClicked, secondClicked)
263 it "works with eventFlags preventDefault" $ runWD $ do
223 it "works with eventFlags preventDefault" $ runWD $ do
264 let click = do
224 let click = do
265− e <- findElemWithRetry $ WD.ByTag "input"
225+ e <- WD.findElem $ WD.ByTag "input"
266 s0 <- WD.isSelected e
226 s0 <- WD.isSelected e
267 WD.click e
227 WD.click e
268 s1 <- WD.isSelected e
228 s1 <- WD.isSelected e
@@ -276,7 +236,7 @@ tests withDebugging wdConfig caps _selenium = do
276 assertEqual "Click not prevented" (False, False) clicked
236 assertEqual "Click not prevented" (False, False) clicked
277 it "can add/update/remove attributes" $ runWD $ do
237 it "can add/update/remove attributes" $ runWD $ do
278 let checkInitialAttrs = do
238 let checkInitialAttrs = do
279− e <- findElemWithRetry $ WD.ByTag "div"
239+ e <- WD.findElem $ WD.ByTag "div"
280 assertAttr e "const" (Just "const")
240 assertAttr e "const" (Just "const")
281 assertAttr e "delete" (Just "delete")
241 assertAttr e "delete" (Just "delete")
282 assertAttr e "init" (Just "init")
242 assertAttr e "init" (Just "init")
@@ -284,11 +244,11 @@ tests withDebugging wdConfig caps _selenium = do
285 checkModifyAttrs e = do
245 checkModifyAttrs e = do
286 WD.click e
246 WD.click e
287− withRetry $ do
247+ liftIO $ threadDelay 100000
288− assertAttr e "const" (Just "const")
248+ assertAttr e "const" (Just "const")
289− assertAttr e "delete" Nothing
249+ assertAttr e "delete" Nothing
290− assertAttr e "init" (Just "click")
250+ assertAttr e "init" (Just "click")
291− assertAttr e "click" (Just "click")
251+ assertAttr e "click" (Just "click")
292 testWidget' checkInitialAttrs checkModifyAttrs $ mdo
252 testWidget' checkInitialAttrs checkModifyAttrs $ mdo
293 let conf = def
253 let conf = def
294 & initialAttributes .~ "const" =: "const" <> "delete" =: "delete" <> "init" =: "init"
254 & initialAttributes .~ "const" =: "const" <> "delete" =: "delete" <> "init" =: "init"
@@ -296,87 +256,40 @@ tests withDebugging wdConfig caps _selenium = do
296 (e, ()) <- element "div" conf $ text "hello world"
256 (e, ()) <- element "div" conf $ text "hello world"
297 let click = domEvent Click e
257 let click = domEvent Click e
298 return ()
258 return ()
259+ -- TODO check this is the correct solution
260+ it "has ssr attribute, removes ssr attribute" $ runWD $ do
261+ let checkSSRAttr = do
262+ e <- WD.findElem $ WD.ByTag "div"
263+ assertAttr e "data-ssr" (Just "")
265+ testWidget' checkSSRAttr (\e -> assertAttr e "data-ssr" Nothing) $ el "div" $ text "hello world"
300− session' "inputElement" $ do
267+ describe "inputElement" $ do
301− describe "static renderer" $ do
268+ describe "hydration" $ session' $ do
302− it "sets value attribute" $ runWD $ do
303− let checkStatic = do
304− e <- findElemWithRetry $ WD.ByTag "input"
305− WD.attr e "value" `shouldBeWithRetryM` Just "test"
307− checkHydrated e = do
308− WD.attr e "value" `shouldBeWithRetryM` Just "test"
309− testWidget' checkStatic checkHydrated $ void $ inputElement $ def
310− & inputElementConfig_initialValue .~ "test"
311− it "updates value attribute at postBuild" $ runWD $ do
312− let checkStatic = do
313− e <- findElemWithRetry $ WD.ByTag "input"
314− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
316− checkHydrated e = do
317− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
318− testWidget' checkStatic checkHydrated $ do
320− _ <- inputElement $ def
321− & inputElementConfig_initialValue .~ "test"
322− & inputElementConfig_setValue .~ ("test-updated" <$ pb)
324− it "sets checked attr appropriately" $ runWD $ do
325− setCheckedChan <- liftIO newChan
326− let checkStatic = do
327− e <- findElemWithRetry $ WD.ByTag "input"
328− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
331− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
333− WD.click e -- Click to uncheck
334− WD.attr e "checked" `shouldBeWithRetryM` Nothing
335− liftIO $ writeChan setCheckedChan True -- Programatically check the checkbox
336− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
337− testWidget' checkStatic checkValue $ do
338− setChecked <- triggerEventWithChan setCheckedChan
339− _ <- inputElement $ def
340− & initialAttributes .~ "type" =: "checkbox"
341− & inputElementConfig_initialChecked .~ True
342− & inputElementConfig_setChecked .~ setChecked
344− it "sets checked attr appropriately at postbuild" $ runWD $ do
345− let checkStatic = do
346− e <- findElemWithRetry $ WD.ByTag "input"
347− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
350− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
351− testWidget' checkStatic checkValue $ do
353− _ <- inputElement $ def
354− & initialAttributes .~ "type" =: "checkbox"
355− & inputElementConfig_initialChecked .~ False
356− & inputElementConfig_setChecked .~ (True <$ pb)
358− describe "hydration" $ do
359 it "doesn't wipe user input when switching over" $ runWD $ do
269 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
270+ inputRef <- newRef ("" :: Text)
361 testWidget'
271 testWidget'
363− e <- findElemWithRetry $ WD.ByTag "input"
273+ e <- WD.findElem $ WD.ByTag "input"
364− WD.sendKeys "world" e
274+ WD.sendKeys "hello world" e
366 (\e -> do
276 (\e -> do
367− WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
277+ t <- WD.attr e "value"
278+ t `shouldBe` Just "hello world"
368− WD.click =<< findElemWithRetry (WD.ByTag "button")
279+ WD.click <=< WD.findElem $ WD.ByTag "button"
369− readRef inputRef `shouldBeWithRetryM` "hello world"
280+ input <- liftIO $ readRef inputRef
281+ input `shouldBe` "hello world"
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
283+ e <- inputElement def
372 click <- button "save"
284 click <- button "save"
373 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
285 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374 it "captures user input after switchover" $ runWD $ do
286 it "captures user input after switchover" $ runWD $ do
375 inputRef <- newRef ("" :: Text)
287 inputRef <- newRef ("" :: Text)
376 let checkValue = do
288 let checkValue = do
377− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
289+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "input"
378− WD.click =<< findElemWithRetry (WD.ByTag "button")
290+ WD.click <=< WD.findElem $ WD.ByTag "button"
379− readRef inputRef `shouldBeWithRetryM` "hello world"
291+ input <- liftIO $ readRef inputRef
292+ input `shouldBe` "hello world"
380 testWidget (pure ()) checkValue $ do
293 testWidget (pure ()) checkValue $ do
381 e <- inputElement def
294 e <- inputElement def
382 click <- button "save"
295 click <- button "save"
@@ -384,21 +297,23 @@ tests withDebugging wdConfig caps _selenium = do
384 it "sets focus appropriately" $ runWD $ do
297 it "sets focus appropriately" $ runWD $ do
385 focusRef <- newRef False
298 focusRef <- newRef False
386 let checkValue = do
299 let checkValue = do
387− readRef focusRef `shouldBeWithRetryM` False
300+ readRef focusRef >>= flip shouldBe False
388− e <- findElemWithRetry $ WD.ByTag "input"
301+ e <- WD.findElem $ WD.ByTag "input"
389 WD.click e
302 WD.click e
303+ liftIO $ threadDelay 100000
390− readRef focusRef `shouldBeWithRetryM` True
304+ readRef focusRef >>= flip shouldBe True
391 testWidget (pure ()) checkValue $ do
305 testWidget (pure ()) checkValue $ do
392 e <- inputElement def
306 e <- inputElement def
393 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
307 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
394 it "sets focus when focus occurs before hydration" $ runWD $ do
308 it "sets focus when focus occurs before hydration" $ runWD $ do
395 focusRef <- newRef False
309 focusRef <- newRef False
396 let setup = do
310 let setup = do
397− e <- findElemWithRetry $ WD.ByTag "input"
311+ e <- WD.findElem $ WD.ByTag "input"
398 WD.click e
312 WD.click e
399− ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
313+ hasFocus <- (== e) <$> WD.activeElem
314+ hasFocus `shouldBe` True
400− readRef focusRef `shouldBeWithRetryM` False
315+ readRef focusRef >>= flip shouldBe False
401− check = readRef focusRef `shouldBeWithRetryM` True
316+ check = readRef focusRef >>= flip shouldBe True
402 testWidget setup check $ do
317 testWidget setup check $ do
403 e <- inputElement def
318 e <- inputElement def
404 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
319 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
@@ -407,15 +322,17 @@ tests withDebugging wdConfig caps _selenium = do
407 valueRef <- newRef ("" :: Text)
322 valueRef <- newRef ("" :: Text)
408 setValueChan :: Chan Text <- liftIO newChan
323 setValueChan :: Chan Text <- liftIO newChan
409 let checkValue = do
324 let checkValue = do
410− readRef valueByUIRef `shouldBeWithRetryM` ""
325+ readRef valueByUIRef >>= flip shouldBe ""
411− readRef valueRef `shouldBeWithRetryM` ""
326+ readRef valueRef >>= flip shouldBe ""
412− e <- findElemWithRetry $ WD.ByTag "input"
327+ e <- WD.findElem $ WD.ByTag "input"
413 WD.sendKeys "hello" e
328 WD.sendKeys "hello" e
329+ liftIO $ threadDelay 100000
414− readRef valueByUIRef `shouldBeWithRetryM` "hello"
330+ readRef valueByUIRef >>= flip shouldBe "hello"
415− readRef valueRef `shouldBeWithRetryM` "hello"
331+ readRef valueRef >>= flip shouldBe "hello"
416 liftIO $ writeChan setValueChan "world"
332 liftIO $ writeChan setValueChan "world"
333+ liftIO $ threadDelay 100000
417− readRef valueByUIRef `shouldBeWithRetryM` "hello"
334+ readRef valueByUIRef >>= flip shouldBe "hello"
418− readRef valueRef `shouldBeWithRetryM` "world"
335+ readRef valueRef >>= flip shouldBe "world"
419 testWidget (pure ()) checkValue $ do
336 testWidget (pure ()) checkValue $ do
420 update <- triggerEventWithChan setValueChan
337 update <- triggerEventWithChan setValueChan
421 e <- inputElement $ def & inputElementConfig_setValue .~ update
338 e <- inputElement $ def & inputElementConfig_setValue .~ update
@@ -425,181 +342,51 @@ tests withDebugging wdConfig caps _selenium = do
425 checkedByUIRef <- newRef False
342 checkedByUIRef <- newRef False
426 checkedRef <- newRef False
343 checkedRef <- newRef False
427 setCheckedChan <- liftIO newChan
344 setCheckedChan <- liftIO newChan
428− let checkStatic = do
345+ let checkValue = do
346+ readRef checkedByUIRef >>= flip shouldBe False
347+ readRef checkedRef >>= flip shouldBe False
429− e <- findElemWithRetry $ WD.ByTag "input"
348+ e <- WD.findElem $ WD.ByTag "input"
430− WD.attr e "checked" `shouldBeWithRetryM` Nothing
433− readRef checkedByUIRef `shouldBeWithRetryM` False
434− readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
436 WD.moveToCenter e
349 WD.moveToCenter e
437 WD.click e
350 WD.click e
351+ liftIO $ threadDelay 100000
438− readRef checkedByUIRef `shouldBeWithRetryM` True
352+ readRef checkedByUIRef >>= flip shouldBe True
439− readRef checkedRef `shouldBeWithRetryM` True
353+ readRef checkedRef >>= flip shouldBe True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441 liftIO $ writeChan setCheckedChan False
354 liftIO $ writeChan setCheckedChan False
355+ liftIO $ threadDelay 100000
442− readRef checkedByUIRef `shouldBeWithRetryM` True
356+ readRef checkedByUIRef >>= flip shouldBe True
443− readRef checkedRef `shouldBeWithRetryM` False
357+ readRef checkedRef >>= flip shouldBe False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
358+ testWidget (pure ()) checkValue $ do
446 setChecked <- triggerEventWithChan setCheckedChan
359 setChecked <- triggerEventWithChan setCheckedChan
447 e <- inputElement $ def
360 e <- inputElement $ def
448 & initialAttributes .~ "type" =: "checkbox"
361 & initialAttributes .~ "type" =: "checkbox"
449 & inputElementConfig_setChecked .~ setChecked
362 & inputElementConfig_setChecked .~ setChecked
450 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
363 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451 performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
364 performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
452− it "respects user updates to checked which happen before hydration" $ runWD $ do
453− checkedByUIRef <- newRef False
454− checkedRef <- newRef False
455− let checkStatic = do
456− e <- findElemWithRetry $ WD.ByTag "input"
457− WD.attr e "checked" `shouldBeWithRetryM` Nothing
460− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
463− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
464− readRef checkedByUIRef `shouldBeWithRetryM` True
465− readRef checkedRef `shouldBeWithRetryM` True
466− testWidget' checkStatic checkValue $ do
467− e <- inputElement $ def
468− & initialAttributes .~ "type" =: "checkbox"
469− performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
470− performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
471 it "captures file uploads" $ runWD $ do
365 it "captures file uploads" $ runWD $ do
472 filesRef :: IORef [Text] <- newRef []
366 filesRef :: IORef [Text] <- newRef []
473 let uploadFile = do
367 let uploadFile = do
474− e <- findElemWithRetry $ WD.ByTag "input"
368+ e <- WD.findElem $ WD.ByTag "input"
475 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
369 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
476 WD.sendKeys (T.pack path) e
370 WD.sendKeys (T.pack path) e
477− WD.click =<< findElemWithRetry (WD.ByTag "button")
371+ WD.click <=< WD.findElem $ WD.ByTag "button"
478 liftIO $ removeFile path
372 liftIO $ removeFile path
373+ input <- readRef filesRef
479− readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
374+ input `shouldBe` [T.pack $ FilePath.takeFileName path]
480 testWidget (pure ()) uploadFile $ do
375 testWidget (pure ()) uploadFile $ do
481 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
376 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
482 click <- button "save"
377 click <- button "save"
483 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
378 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484 names <- liftJSM $ traverse File.getName fs
379 names <- liftJSM $ traverse File.getName fs
485 liftIO $ writeRef filesRef names
380 liftIO $ writeRef filesRef names
486− it "fires _input event if the user altered the value before hydration" $ runWD $ do
381+
487− input <- newRef ("" :: Text)
488− update <- newRef ("" :: Text)
489− let checkStatic = do
490− e <- findElemWithRetry $ WD.ByTag "input"
491− WD.attr e "value" `shouldBeWithRetryM` Just ""
492− WD.sendKeys "test" e
493− WD.attr e "value" `shouldBeWithRetryM` Just "test"
495− checkHydrated e = do
496− WD.attr e "value" `shouldBeWithRetryM` Just "test"
497− readRef input `shouldBeWithRetryM` "test"
498− readRef update `shouldBeWithRetryM` "test"
499− testWidget' checkStatic checkHydrated $ do
500− e <- inputElement def
501− performEvent_ $ liftIO . writeRef input <$> _inputElement_input e
502− performEvent_ $ liftIO . writeRef update <$> updated (_inputElement_value e)
503− it "does not fire _input event when the value is updated at postBuild" $ runWD $ do
504− input <- newRef (Nothing :: Maybe Text)
505− let checkStatic = do
506− e <- findElemWithRetry $ WD.ByTag "input"
507− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
509− checkHydrated e = do
510− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
511− readRef input `shouldBeWithRetryM` Nothing
512− testWidget' checkStatic checkHydrated $ do
514− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
515− performEvent_ $ liftIO . writeRef input . Just <$> _inputElement_input e
516− it "SSR produces correct DOM based on inputElement values when setValue happens at postBuild" $ runWD $ do
518− input <- findElemWithRetry $ WD.ByTag "input"
519− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
520− p <- findElemWithRetry (WD.ByTag "p")
521− shouldContainText "pb" p
522− testWidget checkBoth checkBoth $ do
524− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
525− el "p" $ dynText $ _inputElement_value e
526− it "does not fail when both setValue AND user updated value happen before switchover" $ runWD $ do
527− let checkStatic = do
528− input <- findElemWithRetry $ WD.ByTag "input"
529− h2_value <- findElemWithRetry (WD.ByTag "h2")
530− h3_input <- findElemWithRetry (WD.ByTag "h3")
531− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
532− shouldContainText "pb" h2_value
533− shouldContainText "" h3_input
534− WD.sendKeys "abc" input
535− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
536− shouldContainText "pb" h2_value
537− shouldContainText "" h3_input
538− pure (input, h2_value, h3_input)
539− checkHydrated (input, h2_value, h3_input) = do
540− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
541− shouldContainText "pbabc" h3_input
542− shouldContainText "pbabc pb" h2_value
544− testWidget' checkStatic checkHydrated $ do
546− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
547− el "h1" $ dynText $ _inputElement_value e
548− el "h2" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ updated $ _inputElement_value e
549− el "h3" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ _inputElement_input e
550− it "value is correct when both setValue AND user updated value happen before switchover" $ runWD $ do
551− let checkStatic = do
552− input <- findElemWithRetry $ WD.ByTag "input"
553− p <- findElemWithRetry (WD.ByTag "p")
554− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
555− shouldContainText "pb" p
556− WD.sendKeys "abc" input
557− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
558− shouldContainText "pb" p -- It won't be updated yet
560− checkHydrated (input, p) = do
561− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
562− shouldContainText "pbabc" p
564− testWidget' checkStatic checkHydrated $ do
566− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
567− el "p" $ dynText $ _inputElement_value e
568− it "input event and (updated value) fire correctly when both setValue AND user updated value happen before switchover" $ runWD $ do
569− valRef <- newRef ([] :: [Text])
570− inputRef <- newRef ([] :: [Text])
571− let consRef ref a = liftIO $ atomicModifyRef ref $ \as -> (a:as, ())
573− input <- findElemWithRetry $ WD.ByTag "input"
574− p <- findElemWithRetry (WD.ByTag "p")
575− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
576− shouldContainText "pb" p
577− WD.sendKeys "abc" input
578− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
579− shouldContainText "pb" p -- It won't be updated yet
580− readRef inputRef `shouldBeWithRetryM` [] -- Should never fire input ref during SSR
581− readRef valRef `shouldBeWithRetryM` ["pb"]
583− checkHydrated (input, p) = do
584− readRef inputRef `shouldBeWithRetryM` ["pbabc"]
585− readRef valRef `shouldBeWithRetryM` ["pbabc", "pb"]
586− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
587− shouldContainText "pbabc" p
589− testWidget' checkStatic checkHydrated $ do
590− liftIO $ writeRef valRef []
592− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
593− el "p" $ dynText $ _inputElement_value e
594− performEvent_ $ consRef valRef <$> updated (_inputElement_value e)
595− performEvent_ $ consRef inputRef <$> _inputElement_input e
596− describe "hydration/immediate" $ do
382+ describe "hydration/immediate" $ session' $ do
597 it "captures user input after switchover" $ runWD $ do
383 it "captures user input after switchover" $ runWD $ do
598 inputRef :: IORef Text <- newRef ""
384 inputRef :: IORef Text <- newRef ""
599 let checkValue = do
385 let checkValue = do
600− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
386+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "input"
601− WD.click =<< findElemWithRetry (WD.ByTag "button")
387+ WD.click <=< WD.findElem $ WD.ByTag "button"
602− readRef inputRef `shouldBeWithRetryM` "hello world"
388+ input <- readRef inputRef
389+ input `shouldBe` "hello world"
603 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
390 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
604 e <- inputElement def
391 e <- inputElement def
605 click <- button "save"
392 click <- button "save"
@@ -607,10 +394,11 @@ tests withDebugging wdConfig caps _selenium = do
607 it "sets focus appropriately" $ runWD $ do
394 it "sets focus appropriately" $ runWD $ do
608 focusRef <- newRef False
395 focusRef <- newRef False
609 let checkValue = do
396 let checkValue = do
610− readRef focusRef `shouldBeWithRetryM` False
397+ readRef focusRef >>= flip shouldBe False
611− e <- findElemWithRetry $ WD.ByTag "input"
398+ e <- WD.findElem $ WD.ByTag "input"
612 WD.click e
399 WD.click e
400+ liftIO $ threadDelay 100000
613− readRef focusRef `shouldBeWithRetryM` True
401+ readRef focusRef >>= flip shouldBe True
614 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
402 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
615 e <- inputElement def
403 e <- inputElement def
616 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
404 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
@@ -619,15 +407,17 @@ tests withDebugging wdConfig caps _selenium = do
619 valueRef :: IORef Text <- newRef ""
407 valueRef :: IORef Text <- newRef ""
620 setValueChan :: Chan Text <- liftIO newChan
408 setValueChan :: Chan Text <- liftIO newChan
621 let checkValue = do
409 let checkValue = do
622− readRef valueByUIRef `shouldBeWithRetryM` ""
410+ readRef valueByUIRef >>= flip shouldBe ""
623− readRef valueRef `shouldBeWithRetryM` ""
411+ readRef valueRef >>= flip shouldBe ""
624− e <- findElemWithRetry $ WD.ByTag "input"
412+ e <- WD.findElem $ WD.ByTag "input"
625 WD.sendKeys "hello" e
413 WD.sendKeys "hello" e
414+ liftIO $ threadDelay 100000
626− readRef valueByUIRef `shouldBeWithRetryM` "hello"
415+ readRef valueByUIRef >>= flip shouldBe "hello"
627− readRef valueRef `shouldBeWithRetryM` "hello"
416+ readRef valueRef >>= flip shouldBe "hello"
628 liftIO $ writeChan setValueChan "world"
417 liftIO $ writeChan setValueChan "world"
418+ liftIO $ threadDelay 100000
629− readRef valueByUIRef `shouldBeWithRetryM` "hello"
419+ readRef valueByUIRef >>= flip shouldBe "hello"
630− readRef valueRef `shouldBeWithRetryM` "world"
420+ readRef valueRef >>= flip shouldBe "world"
631 testWidget (pure ()) checkValue $ do
421 testWidget (pure ()) checkValue $ do
632 update <- triggerEventWithChan setValueChan
422 update <- triggerEventWithChan setValueChan
633 prerender_ (pure ()) $ do
423 prerender_ (pure ()) $ do
@@ -639,16 +429,18 @@ tests withDebugging wdConfig caps _selenium = do
639 checkedRef <- newRef False
429 checkedRef <- newRef False
640 setCheckedChan <- liftIO newChan
430 setCheckedChan <- liftIO newChan
641 let checkValue = do
431 let checkValue = do
642− readRef checkedByUIRef `shouldBeWithRetryM` False
432+ readRef checkedByUIRef >>= flip shouldBe False
643− readRef checkedRef `shouldBeWithRetryM` False
433+ readRef checkedRef >>= flip shouldBe False
644− e <- findElemWithRetry $ WD.ByTag "input"
434+ e <- WD.findElem $ WD.ByTag "input"
645 WD.moveToCenter e
435 WD.moveToCenter e
646 WD.click e
436 WD.click e
437+ liftIO $ threadDelay 100000
647− readRef checkedByUIRef `shouldBeWithRetryM` True
438+ readRef checkedByUIRef >>= flip shouldBe True
648− readRef checkedRef `shouldBeWithRetryM` True
439+ readRef checkedRef >>= flip shouldBe True
649 liftIO $ writeChan setCheckedChan False
440 liftIO $ writeChan setCheckedChan False
441+ liftIO $ threadDelay 100000
650− readRef checkedByUIRef `shouldBeWithRetryM` True
442+ readRef checkedByUIRef >>= flip shouldBe True
651− readRef checkedRef `shouldBeWithRetryM` False
443+ readRef checkedRef >>= flip shouldBe False
652 testWidget (pure ()) checkValue $ do
444 testWidget (pure ()) checkValue $ do
653 setChecked <- triggerEventWithChan setCheckedChan
445 setChecked <- triggerEventWithChan setCheckedChan
654 prerender_ (pure ()) $ do
446 prerender_ (pure ()) $ do
@@ -660,12 +452,13 @@ tests withDebugging wdConfig caps _selenium = do
660 it "captures file uploads" $ runWD $ do
452 it "captures file uploads" $ runWD $ do
661 filesRef :: IORef [Text] <- newRef []
453 filesRef :: IORef [Text] <- newRef []
662 let uploadFile = do
454 let uploadFile = do
663− e <- findElemWithRetry $ WD.ByTag "input"
455+ e <- WD.findElem $ WD.ByTag "input"
664 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
456 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
665 WD.sendKeys (T.pack path) e
457 WD.sendKeys (T.pack path) e
666− WD.click =<< findElemWithRetry (WD.ByTag "button")
458+ WD.click <=< WD.findElem $ WD.ByTag "button"
667 liftIO $ removeFile path
459 liftIO $ removeFile path
460+ input <- liftIO $ readRef filesRef
668− readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
461+ input `shouldBe` [T.pack $ FilePath.takeFileName path]
669 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
462 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
670 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
463 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
671 click <- button "save"
464 click <- button "save"
@@ -673,42 +466,21 @@ tests withDebugging wdConfig caps _selenium = do
673 names <- liftJSM $ traverse File.getName fs
466 names <- liftJSM $ traverse File.getName fs
674 liftIO $ writeRef filesRef names
467 liftIO $ writeRef filesRef names
676− session' "textAreaElement" $ do
469+ describe "textAreaElement" $ do
677− describe "static renderer" $ do
678− it "sets value attribute" $ runWD $ do
679− let checkStatic = do
680− e <- findElemWithRetry $ WD.ByTag "textarea"
681− WD.attr e "value" `shouldBeWithRetryM` Just "test"
683− checkHydrated e = do
684− WD.attr e "value" `shouldBeWithRetryM` Just "test"
685− testWidget' checkStatic checkHydrated $ void $ textAreaElement $ def
686− & textAreaElementConfig_initialValue .~ "test"
687− it "updates value attribute at postBuild" $ runWD $ do
688− let checkStatic = do
689− e <- findElemWithRetry $ WD.ByTag "textarea"
690− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
692− checkHydrated e = do
693− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
694− testWidget' checkStatic checkHydrated $ do
696− _ <- textAreaElement $ def
697− & textAreaElementConfig_initialValue .~ "test"
698− & textAreaElementConfig_setValue .~ ("test-updated" <$ pb)
700− describe "hydration" $ do
470+ describe "hydration" $ session' $ do
701 it "doesn't wipe user input when switching over" $ runWD $ do
471 it "doesn't wipe user input when switching over" $ runWD $ do
702 inputRef <- newRef ("" :: Text)
472 inputRef <- newRef ("" :: Text)
703 testWidget'
473 testWidget'
705− e <- findElemWithRetry $ WD.ByTag "textarea"
475+ e <- WD.findElem $ WD.ByTag "textarea"
706 WD.sendKeys "hello world" e
476 WD.sendKeys "hello world" e
708 (\e -> do
478 (\e -> do
709− WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
479+ t <- WD.attr e "value"
480+ t `shouldBe` Just "hello world"
710− WD.click <=< findElemWithRetry $ WD.ByTag "button"
481+ WD.click <=< WD.findElem $ WD.ByTag "button"
711− readRef inputRef `shouldBeWithRetryM` "hello world"
482+ input <- readRef inputRef
483+ input `shouldBe` "hello world"
713 e <- textAreaElement def
485 e <- textAreaElement def
714 click <- button "save"
486 click <- button "save"
@@ -716,9 +488,10 @@ tests withDebugging wdConfig caps _selenium = do
716 it "captures user input after switchover" $ runWD $ do
488 it "captures user input after switchover" $ runWD $ do
717 inputRef <- newRef ("" :: Text)
489 inputRef <- newRef ("" :: Text)
718 let checkValue = do
490 let checkValue = do
719− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "textarea")
491+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "textarea"
720− WD.click =<< findElemWithRetry (WD.ByTag "button")
492+ WD.click <=< WD.findElem $ WD.ByTag "button"
721− readRef inputRef `shouldBeWithRetryM` "hello world"
493+ input <- readRef inputRef
494+ input `shouldBe` "hello world"
722 testWidget (pure ()) checkValue $ do
495 testWidget (pure ()) checkValue $ do
723 e <- textAreaElement def
496 e <- textAreaElement def
724 click <- button "save"
497 click <- button "save"
@@ -726,21 +499,23 @@ tests withDebugging wdConfig caps _selenium = do
726 it "sets focus appropriately" $ runWD $ do
499 it "sets focus appropriately" $ runWD $ do
727 focusRef <- newRef False
500 focusRef <- newRef False
728 let checkValue = do
501 let checkValue = do
729− readRef focusRef `shouldBeWithRetryM` False
502+ readRef focusRef >>= flip shouldBe False
730− e <- findElemWithRetry $ WD.ByTag "textarea"
503+ e <- WD.findElem $ WD.ByTag "textarea"
731 WD.click e
504 WD.click e
505+ liftIO $ threadDelay 100000
732− readRef focusRef `shouldBeWithRetryM` True
506+ readRef focusRef >>= flip shouldBe True
733 testWidget (pure ()) checkValue $ do
507 testWidget (pure ()) checkValue $ do
734 e <- textAreaElement def
508 e <- textAreaElement def
735 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
509 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
736 it "sets focus when focus occurs before hydration" $ runWD $ do
510 it "sets focus when focus occurs before hydration" $ runWD $ do
737 focusRef <- newRef False
511 focusRef <- newRef False
738 let setup = do
512 let setup = do
739− e <- findElemWithRetry $ WD.ByTag "textarea"
513+ e <- WD.findElem $ WD.ByTag "textarea"
740 WD.click e
514 WD.click e
741− ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
515+ hasFocus <- (== e) <$> WD.activeElem
516+ hasFocus `shouldBe` True
742− readRef focusRef `shouldBeWithRetryM` False
517+ readRef focusRef >>= flip shouldBe False
743− check = readRef focusRef `shouldBeWithRetryM` True
518+ check = readRef focusRef >>= flip shouldBe True
744 testWidget setup check $ do
519 testWidget setup check $ do
745 e <- textAreaElement def
520 e <- textAreaElement def
746 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
521 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
@@ -749,110 +524,31 @@ tests withDebugging wdConfig caps _selenium = do
749 valueRef <- newRef ("" :: Text)
524 valueRef <- newRef ("" :: Text)
750 setValueChan :: Chan Text <- liftIO newChan
525 setValueChan :: Chan Text <- liftIO newChan
751 let checkValue = do
526 let checkValue = do
752− readRef valueByUIRef `shouldBeWithRetryM` ""
527+ readRef valueByUIRef >>= flip shouldBe ""
753− readRef valueRef `shouldBeWithRetryM` ""
528+ readRef valueRef >>= flip shouldBe ""
754− e <- findElemWithRetry $ WD.ByTag "textarea"
529+ e <- WD.findElem $ WD.ByTag "textarea"
755 WD.sendKeys "hello" e
530 WD.sendKeys "hello" e
531+ liftIO $ threadDelay 100000
756− readRef valueByUIRef `shouldBeWithRetryM` "hello"
532+ readRef valueByUIRef >>= flip shouldBe "hello"
757− readRef valueRef `shouldBeWithRetryM` "hello"
533+ readRef valueRef >>= flip shouldBe "hello"
758 liftIO $ writeChan setValueChan "world"
534 liftIO $ writeChan setValueChan "world"
535+ liftIO $ threadDelay 100000
759− readRef valueByUIRef `shouldBeWithRetryM` "hello"
536+ readRef valueByUIRef >>= flip shouldBe "hello"
760− readRef valueRef `shouldBeWithRetryM` "world"
537+ readRef valueRef >>= flip shouldBe "world"
761 testWidget (pure ()) checkValue $ do
538 testWidget (pure ()) checkValue $ do
762 setValue' <- triggerEventWithChan setValueChan
539 setValue' <- triggerEventWithChan setValueChan
763 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
540 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
541 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
542 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
766− it "fires _input event if the user altered the value before hydration" $ runWD $ do
767− textarea <- newRef ("" :: Text)
768− update <- newRef ("" :: Text)
769− let checkStatic = do
770− e <- findElemWithRetry $ WD.ByTag "textarea"
771− WD.attr e "value" `shouldBeWithRetryM` Just ""
772− WD.sendKeys "test" e
773− WD.attr e "value" `shouldBeWithRetryM` Just "test"
775− checkHydrated e = do
776− WD.attr e "value" `shouldBeWithRetryM` Just "test"
777− readRef textarea `shouldBeWithRetryM` "test"
778− readRef update `shouldBeWithRetryM` "test"
779− testWidget' checkStatic checkHydrated $ do
780− e <- textAreaElement def
781− performEvent_ $ liftIO . writeRef textarea <$> _textAreaElement_input e
782− performEvent_ $ liftIO . writeRef update <$> updated (_textAreaElement_value e)
783− it "does not fire _input event when the value is updated at postBuild" $ runWD $ do
784− textarea <- newRef (Nothing :: Maybe Text)
785− let checkStatic = do
786− e <- findElemWithRetry $ WD.ByTag "textarea"
787− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
789− checkHydrated e = do
790− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
791− readRef textarea `shouldBeWithRetryM` Nothing
792− testWidget' checkStatic checkHydrated $ do
794− e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
795− performEvent_ $ liftIO . writeRef textarea . Just <$> _textAreaElement_input e
796− it "SSR produces correct DOM based on textAreaElement values when setValue happens at postBuild" $ runWD $ do
798− textarea <- findElemWithRetry $ WD.ByTag "textarea"
799− WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
800− p <- findElemWithRetry (WD.ByTag "p")
801− shouldContainText "pb" p
802− testWidget checkBoth checkBoth $ do
804− e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
805− el "p" $ dynText $ _textAreaElement_value e
806− it "does not fail when both setValue AND user updated value happen before switchover" $ runWD $ do
807− let checkStatic = do
808− textarea <- findElemWithRetry $ WD.ByTag "textarea"
809− h2_value <- findElemWithRetry (WD.ByTag "h2")
810− h3_input <- findElemWithRetry (WD.ByTag "h3")
811− WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
812− shouldContainText "pb" h2_value
813− shouldContainText "" h3_input
814− WD.sendKeys "abc" textarea
815− WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
816− shouldContainText "pb" h2_value
817− shouldContainText "" h3_input
818− pure (textarea, h2_value, h3_input)
819− checkHydrated (textarea, h2_value, h3_input) = do
820− WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
821− shouldContainText "pbabc" h3_input
822− shouldContainText "pbabc pb" h2_value
824− testWidget' checkStatic checkHydrated $ do
826− e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
827− el "h1" $ dynText $ _textAreaElement_value e
828− el "h2" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ updated $ _textAreaElement_value e
829− el "h3" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ _textAreaElement_input e
830− it "value is correct when both setValue AND user updated value happen before switchover" $ runWD $ do
831− let checkStatic = do
832− textarea <- findElemWithRetry $ WD.ByTag "textarea"
833− p <- findElemWithRetry (WD.ByTag "p")
834− WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
835− shouldContainText "pb" p
836− WD.sendKeys "abc" textarea
837− WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
838− shouldContainText "pb" p -- It won't be updated yet
840− checkHydrated (textarea, p) = do
841− WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
842− shouldContainText "pbabc" p
844− testWidget' checkStatic checkHydrated $ do
846− e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
847− el "p" $ dynText $ _textAreaElement_value e
849− describe "hydration/immediate" $ do
544+ describe "hydration/immediate" $ session' $ do
850 it "captures user input after switchover" $ runWD $ do
545 it "captures user input after switchover" $ runWD $ do
851 inputRef :: IORef Text <- newRef ""
546 inputRef :: IORef Text <- newRef ""
852 let checkValue = do
547 let checkValue = do
853− WD.sendKeys "hello world" <=< findElemWithRetry $ WD.ByTag "textarea"
548+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "textarea"
854− WD.click <=< findElemWithRetry $ WD.ByTag "button"
549+ WD.click <=< WD.findElem $ WD.ByTag "button"
855− readRef inputRef `shouldBeWithRetryM` "hello world"
550+ input <- liftIO $ readRef inputRef
551+ input `shouldBe` "hello world"
856 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
552 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
857 e <- textAreaElement def
553 e <- textAreaElement def
858 click <- button "save"
554 click <- button "save"
@@ -860,10 +556,11 @@ tests withDebugging wdConfig caps _selenium = do
860 it "sets focus appropriately" $ runWD $ do
556 it "sets focus appropriately" $ runWD $ do
861 focusRef <- newRef False
557 focusRef <- newRef False
862 let checkValue = do
558 let checkValue = do
863− readRef focusRef `shouldBeWithRetryM` False
559+ readRef focusRef >>= flip shouldBe False
864− e <- findElemWithRetry $ WD.ByTag "textarea"
560+ e <- WD.findElem $ WD.ByTag "textarea"
865 WD.click e
561 WD.click e
562+ liftIO $ threadDelay 100000
866− readRef focusRef `shouldBeWithRetryM` True
563+ readRef focusRef >>= flip shouldBe True
867 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
564 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
868 e <- textAreaElement def
565 e <- textAreaElement def
869 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
566 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
@@ -872,15 +569,17 @@ tests withDebugging wdConfig caps _selenium = do
872 valueRef :: IORef Text <- newRef ""
569 valueRef :: IORef Text <- newRef ""
873 setValueChan :: Chan Text <- liftIO newChan
570 setValueChan :: Chan Text <- liftIO newChan
874 let checkValue = do
571 let checkValue = do
875− readRef valueByUIRef `shouldBeWithRetryM` ""
572+ readRef valueByUIRef >>= flip shouldBe ""
876− readRef valueRef `shouldBeWithRetryM` ""
573+ readRef valueRef >>= flip shouldBe ""
877− e <- findElemWithRetry $ WD.ByTag "textarea"
574+ e <- WD.findElem $ WD.ByTag "textarea"
878 WD.sendKeys "hello" e
575 WD.sendKeys "hello" e
576+ liftIO $ threadDelay 100000
879− readRef valueByUIRef `shouldBeWithRetryM` "hello"
577+ readRef valueByUIRef >>= flip shouldBe "hello"
880− readRef valueRef `shouldBeWithRetryM` "hello"
578+ readRef valueRef >>= flip shouldBe "hello"
881 liftIO $ writeChan setValueChan "world"
579 liftIO $ writeChan setValueChan "world"
580+ liftIO $ threadDelay 100000
882− readRef valueByUIRef `shouldBeWithRetryM` "hello"
581+ readRef valueByUIRef >>= flip shouldBe "hello"
883− readRef valueRef `shouldBeWithRetryM` "world"
582+ readRef valueRef >>= flip shouldBe "world"
884 testWidget (pure ()) checkValue $ do
583 testWidget (pure ()) checkValue $ do
885 setValue' <- triggerEventWithChan setValueChan
584 setValue' <- triggerEventWithChan setValueChan
886 prerender_ (pure ()) $ do
585 prerender_ (pure ()) $ do
@@ -888,26 +587,26 @@ tests withDebugging wdConfig caps _selenium = do
888 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
587 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
588 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
891− session' "selectElement" $ do
590+ describe "selectElement" $ do
892 let options :: DomBuilder t m => m ()
591 let options :: DomBuilder t m => m ()
893 options = do
592 options = do
894 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
593 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
594 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
595 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
596+ describe "hydration" $ session' $ do
898 it "sets initial value correctly" $ runWD $ do
597 it "sets initial value correctly" $ runWD $ do
899 inputRef <- newRef ("" :: Text)
598 inputRef <- newRef ("" :: Text)
900 let setup = do
599 let setup = do
901− e <- findElemWithRetry $ WD.ByTag "select"
600+ e <- WD.findElem $ WD.ByTag "select"
902 assertAttr e "value" (Just "three")
601 assertAttr e "value" (Just "three")
903− WD.click =<< findElemWithRetry (WD.ById "two")
602+ WD.click <=< WD.findElem $ WD.ById "two"
905 check e = do
604 check e = do
906 assertAttr e "value" (Just "two")
605 assertAttr e "value" (Just "two")
907− readRef inputRef `shouldBeWithRetryM` "three"
606+ readRef inputRef >>= (`shouldBe` "three")
908− WD.click =<< findElemWithRetry (WD.ByTag "button")
607+ WD.click <=< WD.findElem $ WD.ByTag "button"
909 assertAttr e "value" (Just "two")
608 assertAttr e "value" (Just "two")
910− readRef inputRef `shouldBeWithRetryM` "two"
609+ readRef inputRef >>= (`shouldBe` "two")
911 testWidget' setup check $ do
610 testWidget' setup check $ do
912 (e, ()) <- selectElement (def { _selectElementConfig_initialValue = "three" }) options
611 (e, ()) <- selectElement (def { _selectElementConfig_initialValue = "three" }) options
913 click <- button "save"
612 click <- button "save"
@@ -916,12 +615,12 @@ tests withDebugging wdConfig caps _selenium = do
916 it "captures user input after switchover" $ runWD $ do
615 it "captures user input after switchover" $ runWD $ do
917 inputRef <- newRef ("" :: Text)
616 inputRef <- newRef ("" :: Text)
918 let checkValue = do
617 let checkValue = do
919− e <- findElemWithRetry $ WD.ByTag "select"
618+ e <- WD.findElem $ WD.ByTag "select"
920 assertAttr e "value" (Just "one")
619 assertAttr e "value" (Just "one")
921− WD.click =<< findElemWithRetry (WD.ById "two")
620+ WD.click <=< WD.findElem $ WD.ById "two"
922 assertAttr e "value" (Just "two")
621 assertAttr e "value" (Just "two")
923− WD.click =<< findElemWithRetry (WD.ByTag "button")
622+ WD.click <=< WD.findElem $ WD.ByTag "button"
924− readRef inputRef `shouldBeWithRetryM` "two"
623+ readRef inputRef >>= (`shouldBe` "two")
925 testWidget (pure ()) checkValue $ do
624 testWidget (pure ()) checkValue $ do
926 (e, ()) <- selectElement def options
625 (e, ()) <- selectElement def options
927 click <- button "save"
626 click <- button "save"
@@ -929,21 +628,23 @@ tests withDebugging wdConfig caps _selenium = do
929 it "sets focus appropriately" $ runWD $ do
628 it "sets focus appropriately" $ runWD $ do
930 focusRef <- newRef False
629 focusRef <- newRef False
931 let checkValue = do
630 let checkValue = do
932− readRef focusRef `shouldBeWithRetryM` False
631+ readRef focusRef >>= flip shouldBe False
933− e <- findElemWithRetry $ WD.ByTag "select"
632+ e <- WD.findElem $ WD.ByTag "select"
934 WD.click e
633 WD.click e
634+ liftIO $ threadDelay 100000
935− readRef focusRef `shouldBeWithRetryM` True
635+ readRef focusRef >>= flip shouldBe True
936 testWidget (pure ()) checkValue $ do
636 testWidget (pure ()) checkValue $ do
937 (e, ()) <- selectElement def options
637 (e, ()) <- selectElement def options
938 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
638 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
939 it "sets focus when focus occurs before hydration" $ runWD $ do
639 it "sets focus when focus occurs before hydration" $ runWD $ do
940 focusRef <- newRef False
640 focusRef <- newRef False
941 let setup = do
641 let setup = do
942− e <- findElemWithRetry $ WD.ByTag "select"
642+ e <- WD.findElem $ WD.ByTag "select"
943 WD.click e
643 WD.click e
944− ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
644+ hasFocus <- (== e) <$> WD.activeElem
645+ hasFocus `shouldBe` True
945− readRef focusRef `shouldBeWithRetryM` False
646+ readRef focusRef >>= flip shouldBe False
946− check = readRef focusRef `shouldBeWithRetryM` True
647+ check = readRef focusRef >>= flip shouldBe True
947 testWidget setup check $ do
648 testWidget setup check $ do
948 (e, ()) <- selectElement def options
649 (e, ()) <- selectElement def options
949 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
650 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
@@ -952,29 +653,31 @@ tests withDebugging wdConfig caps _selenium = do
952 valueRef <- newRef ("" :: Text)
653 valueRef <- newRef ("" :: Text)
953 setValueChan :: Chan Text <- liftIO newChan
654 setValueChan :: Chan Text <- liftIO newChan
954 let checkValue = do
655 let checkValue = do
955− e <- findElemWithRetry $ WD.ByTag "select"
656+ e <- WD.findElem $ WD.ByTag "select"
956 assertAttr e "value" (Just "one")
657 assertAttr e "value" (Just "one")
957− readRef valueByUIRef `shouldBeWithRetryM` "one"
658+ readRef valueByUIRef >>= flip shouldBe "one"
958− readRef valueRef `shouldBeWithRetryM` "one"
659+ readRef valueRef >>= flip shouldBe "one"
959− WD.click <=< findElemWithRetry $ WD.ById "two"
660+ WD.click <=< WD.findElem $ WD.ById "two"
661+ liftIO $ threadDelay 100000
960− readRef valueByUIRef `shouldBeWithRetryM` "two"
662+ readRef valueByUIRef >>= flip shouldBe "two"
961− readRef valueRef `shouldBeWithRetryM` "two"
663+ readRef valueRef >>= flip shouldBe "two"
962 liftIO $ writeChan setValueChan "three"
664 liftIO $ writeChan setValueChan "three"
665+ liftIO $ threadDelay 100000
963− readRef valueByUIRef `shouldBeWithRetryM` "two"
666+ readRef valueByUIRef >>= flip shouldBe "two"
964− readRef valueRef `shouldBeWithRetryM` "three"
667+ readRef valueRef >>= flip shouldBe "three"
965 testWidget (pure ()) checkValue $ do
668 testWidget (pure ()) checkValue $ do
966 setValue' <- triggerEventWithChan setValueChan
669 setValue' <- triggerEventWithChan setValueChan
967 (e, ()) <- selectElement def { _selectElementConfig_setValue = Just setValue' } options
670 (e, ()) <- selectElement def { _selectElementConfig_setValue = Just setValue' } options
968 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
671 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
672 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
971− describe "hydration/immediate" $ do
674+ describe "hydration/immediate" $ session' $ do
972 it "captures user input after switchover" $ runWD $ do
675 it "captures user input after switchover" $ runWD $ do
973 inputRef :: IORef Text <- newRef ""
676 inputRef :: IORef Text <- newRef ""
974 let checkValue = do
677 let checkValue = do
975− WD.click <=< findElemWithRetry $ WD.ById "two"
678+ WD.click <=< WD.findElem $ WD.ById "two"
976− WD.click <=< findElemWithRetry $ WD.ByTag "button"
679+ WD.click <=< WD.findElem $ WD.ByTag "button"
977− readRef inputRef `shouldBeWithRetryM` "two"
680+ readRef inputRef >>= flip shouldBe "two"
978 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
681 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
979 (e, ()) <- selectElement def options
682 (e, ()) <- selectElement def options
980 click <- button "save"
683 click <- button "save"
@@ -982,16 +685,17 @@ tests withDebugging wdConfig caps _selenium = do
982 it "sets focus appropriately" $ runWD $ do
685 it "sets focus appropriately" $ runWD $ do
983 focusRef <- newRef False
686 focusRef <- newRef False
984 let checkValue = do
687 let checkValue = do
985− readRef focusRef `shouldBeWithRetryM` False
688+ readRef focusRef >>= flip shouldBe False
986− e <- findElemWithRetry $ WD.ByTag "select"
689+ e <- WD.findElem $ WD.ByTag "select"
987 WD.click e
690 WD.click e
691+ liftIO $ threadDelay 100000
988− readRef focusRef `shouldBeWithRetryM` True
692+ readRef focusRef >>= flip shouldBe True
989 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
693 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
990 (e, ()) <- selectElement def options
694 (e, ()) <- selectElement def options
991 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
695 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
992 it "has correct initial value" $ runWD $ do
696 it "has correct initial value" $ runWD $ do
993 valueRef :: IORef Text <- newRef ""
697 valueRef :: IORef Text <- newRef ""
994− let checkValue = readRef valueRef `shouldBeWithRetryM` "one"
698+ let checkValue = readRef valueRef >>= flip shouldBe "one"
995 testWidget (pure ()) checkValue $ do
699 testWidget (pure ()) checkValue $ do
996 prerender_ (pure ()) $ do
700 prerender_ (pure ()) $ do
997 (e, ()) <- selectElement def { _selectElementConfig_initialValue = "one" } options
701 (e, ()) <- selectElement def { _selectElementConfig_initialValue = "one" } options
@@ -1001,12 +705,14 @@ tests withDebugging wdConfig caps _selenium = do
1001 valueRef :: IORef Text <- newRef ""
705 valueRef :: IORef Text <- newRef ""
1002 setValueChan :: Chan Text <- liftIO newChan
706 setValueChan :: Chan Text <- liftIO newChan
1003 let checkValue = do
707 let checkValue = do
1004− WD.click =<< findElemWithRetry (WD.ById "two")
708+ WD.click <=< WD.findElem $ WD.ById "two"
709+ liftIO $ threadDelay 100000
1005− readRef valueByUIRef `shouldBeWithRetryM` "two"
710+ readRef valueByUIRef >>= flip shouldBe "two"
1006− readRef valueRef `shouldBeWithRetryM` "two"
711+ readRef valueRef >>= flip shouldBe "two"
1007 liftIO $ writeChan setValueChan "three"
712 liftIO $ writeChan setValueChan "three"
713+ liftIO $ threadDelay 100000
1008− readRef valueByUIRef `shouldBeWithRetryM` "two"
714+ readRef valueByUIRef >>= flip shouldBe "two"
1009− readRef valueRef `shouldBeWithRetryM` "three"
715+ readRef valueRef >>= flip shouldBe "three"
1010 testWidget (pure ()) checkValue $ do
716 testWidget (pure ()) checkValue $ do
1011 setValue' <- triggerEventWithChan setValueChan
717 setValue' <- triggerEventWithChan setValueChan
1012 prerender_ (pure ()) $ do
718 prerender_ (pure ()) $ do
@@ -1014,12 +720,12 @@ tests withDebugging wdConfig caps _selenium = do
1014 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
720 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
721 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1017− session' "prerender" $ do
723+ describe "prerender" $ session' $ do
1018 it "works in simple case" $ runWD $ do
724 it "works in simple case" $ runWD $ do
1019 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
725 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020 prerender_ (text "One") (text "Two")
726 prerender_ (text "One") (text "Two")
1021 it "removes element correctly" $ runWD $ do
727 it "removes element correctly" $ runWD $ do
1022− testWidget' (findElemWithRetry $ WD.ByTag "span") elementShouldBeRemoved $ do
728+ testWidget' (WD.findElem $ WD.ByTag "span") elementShouldBeRemoved $ do
1023 prerender_ (el "span" $ text "One") (text "Two")
729 prerender_ (el "span" $ text "One") (text "Two")
1024 it "can be nested in server widget" $ runWD $ do
730 it "can be nested in server widget" $ runWD $ do
1025 testWidget (checkBodyText "One") (checkBodyText "Three") $ do
731 testWidget (checkBodyText "One") (checkBodyText "Three") $ do
@@ -1059,9 +765,9 @@ tests withDebugging wdConfig caps _selenium = do
1059 pb <- getPostBuild
765 pb <- getPostBuild
1060 performEvent_ $ liftIO (putMVar lock ()) <$ pb
766 performEvent_ $ liftIO (putMVar lock ()) <$ pb
1061 it "result Dynamic is updated *after* switchover" $ runWD $ do
767 it "result Dynamic is updated *after* switchover" $ runWD $ do
1062− let preSwitchover = checkBodyText "PostBuild"
768+ let static = shouldContainText "PostBuild" =<< WD.findElem (WD.ByTag "body")
1063− check = checkBodyText "Client"
769+ check = shouldContainText "Client" =<< WD.findElem (WD.ByTag "body")
1064− testWidget preSwitchover check $ void $ do
770+ testWidget static check $ void $ do
1065 d <- prerender (pure "Initial") (pure "Client")
771 d <- prerender (pure "Initial") (pure "Client")
1066 pb <- getPostBuild
772 pb <- getPostBuild
1067 initial <- sample $ current d
773 initial <- sample $ current d
@@ -1069,39 +775,32 @@ tests withDebugging wdConfig caps _selenium = do
1069 -- This essentially checks that the client IO runs *after* switchover/postBuild,
775 -- This essentially checks that the client IO runs *after* switchover/postBuild,
1070 -- thus can't create conflicting DOM
776 -- thus can't create conflicting DOM
1071 it "can't exploit IO to break hydration" $ runWD $ do
777 it "can't exploit IO to break hydration" $ runWD $ do
1072− let preSwitchover = checkBodyText "Initial"
778+ let static = shouldContainText "Initial" =<< WD.findElem (WD.ByTag "body")
1073− testWidgetStatic preSwitchover $ void $ do
779+ testWidgetStatic static $ void $ do
1074 ref <- liftIO $ newRef "Initial"
780 ref <- liftIO $ newRef "Initial"
1075 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
781 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1076 text <=< liftIO $ readRef ref
782 text <=< liftIO $ readRef ref
1077 -- As above, so below
783 -- As above, so below
1078 it "can't exploit triggerEvent to break hydration" $ runWD $ do
784 it "can't exploit triggerEvent to break hydration" $ runWD $ do
1079− let preSwitchover = checkBodyText "Initial"
785+ let static = shouldContainText "Initial" =<< WD.findElem (WD.ByTag "body")
1080− check = checkBodyText "Client"
786+ check = shouldContainText "Client" =<< WD.findElem (WD.ByTag "body")
1081− testWidget preSwitchover check $ void $ do
787+ testWidget static check $ void $ do
1082 (e, trigger) <- newTriggerEvent
788 (e, trigger) <- newTriggerEvent
1083 prerender_ (pure ()) (liftIO $ trigger "Client")
789 prerender_ (pure ()) (liftIO $ trigger "Client")
1084 textNode $ TextNodeConfig "Initial" $ Just e
790 textNode $ TextNodeConfig "Initial" $ Just e
1086− session' "namespaces" $ do
1087− it "dyn can be nested in namespaced widget" $ runWD $ do
1088− testWidget (pure ()) (checkTextInTag "svg" "one") $ do
1089− let svgRootCfg = def
1090− & (elementConfig_namespace ?~ "http://www.w3.org/2000/svg")
1091− & (elementConfig_initialAttributes .~ ("width" =: "100%" <> "height" =: "100%" <> "viewBox" =: "0 0 1536 2048"))
1092− void $ element "svg" svgRootCfg $ do
1093− dyn_ $ text "one" <$ pure ()
1095− session' "runWithReplace" $ do
792+ describe "runWithReplace" $ session' $ do
1096 it "works" $ runWD $ do
793 it "works" $ runWD $ do
1097 replaceChan :: Chan Text <- liftIO newChan
794 replaceChan :: Chan Text <- liftIO newChan
1098− let setup = findElemWithRetry $ WD.ByTag "div"
795+ let setup = WD.findElem $ WD.ByTag "div"
1099 check ssr = do
796 check ssr = do
1100 -- Check that the original element still exists and has the correct text
797 -- Check that the original element still exists and has the correct text
1101− shouldContainText "two" ssr
798+ WD.getText ssr >>= flip shouldBe "two"
1102− liftIO $ writeChan replaceChan "three"
800+ writeChan replaceChan "three"
1103 elementShouldBeRemoved ssr
802 elementShouldBeRemoved ssr
1104− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
803+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1105 testWidget' setup check $ do
804 testWidget' setup check $ do
1106 replace <- triggerEventWithChan replaceChan
805 replace <- triggerEventWithChan replaceChan
1107 pb <- getPostBuild
806 pb <- getPostBuild
@@ -1111,13 +810,15 @@ tests withDebugging wdConfig caps _selenium = do
1112 it "can be nested in initial widget" $ runWD $ do
811 it "can be nested in initial widget" $ runWD $ do
1113 replaceChan :: Chan Text <- liftIO newChan
812 replaceChan :: Chan Text <- liftIO newChan
1114− let setup = findElemWithRetry $ WD.ByTag "div"
813+ let setup = WD.findElem $ WD.ByTag "div"
1115 check ssr = do
814 check ssr = do
1116 -- Check that the original element still exists and has the correct text
815 -- Check that the original element still exists and has the correct text
1117− shouldContainText "two" ssr
816+ WD.getText ssr >>= flip shouldBe "two"
1118− liftIO $ writeChan replaceChan "three"
818+ writeChan replaceChan "three"
1119 elementShouldBeRemoved ssr
820 elementShouldBeRemoved ssr
1120− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
821+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1121 testWidget' setup check $ void $ flip runWithReplace never $ do
822 testWidget' setup check $ void $ flip runWithReplace never $ do
1122 replace <- triggerEventWithChan replaceChan
823 replace <- triggerEventWithChan replaceChan
1123 pb <- getPostBuild
824 pb <- getPostBuild
@@ -1126,14 +827,16 @@ tests withDebugging wdConfig caps _selenium = do
1126 , el "span" . text <$> replace
827 , el "span" . text <$> replace
1128 it "can be nested in postBuild widget" $ runWD $ do
829 it "can be nested in postBuild widget" $ runWD $ do
1129− replaceChan :: Chan Text <- liftIO newChan
830+ replaceChan <- liftIO newChan
1130− let setup = findElemWithRetry $ WD.ByTag "div"
831+ let setup = WD.findElem $ WD.ByTag "div"
1131 check ssr = do
832 check ssr = do
1132 -- Check that the original element still exists and has the correct text
833 -- Check that the original element still exists and has the correct text
1133− shouldContainText "two" ssr
834+ WD.getText ssr >>= flip shouldBe "two"
1134− liftIO $ writeChan replaceChan "three"
836+ writeChan replaceChan "three"
1135 elementShouldBeRemoved ssr
838 elementShouldBeRemoved ssr
1136− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
839+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1137 testWidget' setup check $ void $ do
840 testWidget' setup check $ void $ do
1138 pb <- getPostBuild
841 pb <- getPostBuild
1139 runWithReplace (pure ()) $ ffor pb $ \() -> do
842 runWithReplace (pure ()) $ ffor pb $ \() -> do
@@ -1159,15 +862,17 @@ tests withDebugging wdConfig caps _selenium = do
1159 replaceChan2 :: Chan Text <- liftIO newChan
862 replaceChan2 :: Chan Text <- liftIO newChan
1160 lock :: MVar () <- liftIO newEmptyMVar
863 lock :: MVar () <- liftIO newEmptyMVar
1161 let check = do
864 let check = do
1162− shouldContainText "" =<< findElemWithRetry (WD.ByTag "body")
865+ shouldContainText "" =<< WD.findElem (WD.ByTag "body")
1163 liftIO $ do
866 liftIO $ do
1164 writeChan replaceChan1 "one"
867 writeChan replaceChan1 "one"
1165 takeMVar lock
868 takeMVar lock
1166− one <- findElemWithRetry $ WD.ByTag "div"
869+ one <- WD.findElem $ WD.ByTag "div"
1167− shouldContainText "pb" one
870+ WD.getText one >>= flip shouldBe "pb"
1168− liftIO $ writeChan replaceChan2 "two"
872+ writeChan replaceChan2 "two"
1169 elementShouldBeRemoved one
874 elementShouldBeRemoved one
1170− shouldContainText "two" =<< findElemWithRetry (WD.ByTag "span")
875+ shouldContainText "two" =<< WD.findElem (WD.ByTag "span")
1171 testWidget (pure ()) check $ void $ do
876 testWidget (pure ()) check $ void $ do
1172 replace1 <- triggerEventWithChan replaceChan1
877 replace1 <- triggerEventWithChan replaceChan1
1173 runWithReplace (pure ()) $ ffor replace1 $ \r1 -> do
878 runWithReplace (pure ()) $ ffor replace1 $ \r1 -> do
@@ -1208,12 +913,14 @@ tests withDebugging wdConfig caps _selenium = do
1208 it "works in immediate mode (RHS of prerender)" $ runWD $ do
913 it "works in immediate mode (RHS of prerender)" $ runWD $ do
1209 replaceChan :: Chan Text <- liftIO newChan
914 replaceChan :: Chan Text <- liftIO newChan
1210 let check = do
915 let check = do
1211− checkBodyText "one"
1212− one <- findElemWithRetry $ WD.ByTag "div"
916+ one <- WD.findElem $ WD.ByTag "div"
1213− shouldContainText "one" one
917+ shouldContainText "one" =<< WD.findElem (WD.ByTag "body")
918+ WD.getText one >>= flip shouldBe "one"
1214− liftIO $ writeChan replaceChan "pb"
920+ writeChan replaceChan "pb"
1215 elementShouldBeRemoved one
922 elementShouldBeRemoved one
1216− shouldContainText "pb" =<< findElemWithRetry (WD.ByTag "span")
923+ shouldContainText "pb" =<< WD.findElem (WD.ByTag "span")
1217 testWidget (pure ()) check $ void $ do
924 testWidget (pure ()) check $ void $ do
1218 replace <- triggerEventWithChan replaceChan
925 replace <- triggerEventWithChan replaceChan
1219 prerender_ blank $ do
926 prerender_ blank $ do
@@ -1221,12 +928,14 @@ tests withDebugging wdConfig caps _selenium = do
1221 it "works with postBuild in immediate mode (RHS of prerender)" $ runWD $ do
928 it "works with postBuild in immediate mode (RHS of prerender)" $ runWD $ do
1222 replaceChan :: Chan Text <- liftIO newChan
929 replaceChan :: Chan Text <- liftIO newChan
1223 let check = do
930 let check = do
1224− checkBodyText "two"
1225− two <- findElemWithRetry $ WD.ByTag "div"
931+ two <- WD.findElem $ WD.ByTag "div"
1226− shouldContainText "two" two
932+ shouldContainText "two" =<< WD.findElem (WD.ByTag "body")
933+ WD.getText two >>= flip shouldBe "two"
1227− liftIO $ writeChan replaceChan "three"
935+ writeChan replaceChan "three"
1228 elementShouldBeRemoved two
937 elementShouldBeRemoved two
1229− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
938+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1230 testWidget (pure ()) check $ void $ do
939 testWidget (pure ()) check $ void $ do
1231 replace <- triggerEventWithChan replaceChan
940 replace <- triggerEventWithChan replaceChan
1232 prerender_ blank $ do
941 prerender_ blank $ do
@@ -1236,61 +945,7 @@ tests withDebugging wdConfig caps _selenium = do
1236 , el "span" . text <$> replace
945 , el "span" . text <$> replace
1239− let checkInnerHtml t x = findElemWithRetry (WD.ByTag t) >>= (`attr` "innerHTML") >>= (`shouldBe` Just x)
1240− it "removes bracketing comments" $ runWD $ do
1241− replaceChan :: Chan () <- liftIO newChan
1243− preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1245− liftIO $ writeChan replaceChan () -- trigger creation of p tag
1246− _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1247− checkInnerHtml "div" "before|<p>inner2</p>|after"
1248− testWidget' preSwitchover check $ do
1249− replace <- triggerEventWithChan replaceChan
1252− _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1254− it "ignores extra ending bracketing comment" $ runWD $ do
1255− replaceChan :: Chan () <- liftIO newChan
1257− preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0--><!--replace-end-0-->|after"
1259− liftIO $ writeChan replaceChan () -- trigger creation of p tag
1260− _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1261− checkInnerHtml "div" "before|inner2|after"
1262− testWidget' preSwitchover check $ do
1263− replace <- triggerEventWithChan replaceChan
1266− _ <- runWithReplace (text "inner1" *> comment "replace-end-0") $ text "inner2" <$ replace
1268− void $ runWithReplace blank $ el "p" blank <$ replace -- Signal tag for end of test
1269− -- TODO This test actually causes a hydration failure, but it wasn't
1270− -- previously detected, so I've marked it pending
1271− xit "ignores missing ending bracketing comments" $ runWD $ do
1272− replaceChan :: Chan () <- liftIO newChan
1275− checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1276− divEl <- findElemWithRetry (WD.ByTag "div")
1277− let wrongHtml = "<!--replace-start-0-->inner1"
1278− actualHtml :: String <- WD.executeJS
1279− [WD.JSArg divEl, WD.JSArg wrongHtml]
1280− "arguments[0].innerHTML = arguments[1]; return arguments[0].innerHTML"
1281− actualHtml `shouldBe` wrongHtml
1283− liftIO $ writeChan replaceChan () -- trigger creation of p tag
1284− _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1285− checkInnerHtml "div" "before|<p>inner2</p>|after"
1286− testWidget' preSwitchover check $ do
1287− replace <- triggerEventWithChan replaceChan
1290− _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1293− session' "traverseDMapWithKeyWithAdjust" $ do
948+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
949 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
950 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296 elClass "span" "key" $ text $ textKey k
951 elClass "span" "key" $ text $ textKey k
@@ -1298,58 +953,58 @@ tests withDebugging wdConfig caps _selenium = do
1298 pure (Identity v)
953 pure (Identity v)
1299 checkItem :: WD.Element -> Text -> Text -> WD ()
954 checkItem :: WD.Element -> Text -> Text -> WD ()
1300 checkItem li k v = do
955 checkItem li k v = do
1301− putStrLnDebug "checkItem"
1302− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
956+ shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1303− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
957+ shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1304 checkInitialItems dm xs = do
958 checkInitialItems dm xs = do
1305− putStrLnDebug "checkInitialItems"
1306 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
959 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1307 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
960 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
1308− getAndCheckInitialItems dm = withRetry $ do
961+ getAndCheckInitialItems dm = do
1309− putStrLnDebug "getAndCheckInitialItems"
1310 xs <- WD.findElems (WD.ByTag "li")
962 xs <- WD.findElems (WD.ByTag "li")
1311 checkInitialItems dm xs
963 checkInitialItems dm xs
1313 checkRemoval chan k = do
965 checkRemoval chan k = do
1314− putStrLnDebug "checkRemoval"
1315− e <- findElemWithRetry (WD.ById $ textKey k)
966+ e <- WD.findElem (WD.ById $ textKey k)
1316− liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
968+ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
1317 elementShouldBeRemoved e
970 elementShouldBeRemoved e
1318 checkReplace chan k v = do
971 checkReplace chan k v = do
1319− putStrLnDebug "checkReplace"
1320− e <- findElemWithRetry (WD.ById $ textKey k)
972+ e <- WD.findElem (WD.ById $ textKey k)
1321− liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
974+ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
1322 elementShouldBeRemoved e
976 elementShouldBeRemoved e
1323− e' <- findElemWithRetry $ WD.ById $ textKey k
977+ e' <- WD.findElem (WD.ById $ textKey k)
1324 checkItem e' (textKey k) (T.pack $ show v)
978 checkItem e' (textKey k) (T.pack $ show v)
1325 checkInsert chan k v = do
979 checkInsert chan k v = do
1326− putStrLnDebug "checkInsert"
980+ liftIO $ do
1327− liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
981+ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
1328− e <- findElemWithRetry (WD.ById $ textKey k)
983+ e <- WD.findElem (WD.ById $ textKey k)
1329 checkItem e (textKey k) (T.pack $ show v)
984 checkItem e (textKey k) (T.pack $ show v)
1330 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
985 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1331 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
986 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1332 chan <- liftIO newChan
987 chan <- liftIO newChan
1333− let preSwitchover :: WD [WD.Element]
988+ let static :: WD [WD.Element]
1334− preSwitchover = getAndCheckInitialItems keyMap
989+ static = getAndCheckInitialItems keyMap
1335 check :: [WD.Element] -> WD ()
990 check :: [WD.Element] -> WD ()
1336 check xs = do
991 check xs = do
1337 checkInitialItems keyMap xs
992 checkInitialItems keyMap xs
1338 checkRemoval chan Key_Int
993 checkRemoval chan Key_Int
1339 checkReplace chan Key_Char 'B'
994 checkReplace chan Key_Char 'B'
1340 checkInsert chan Key_Bool True
995 checkInsert chan Key_Bool True
1341− testWidget' preSwitchover check $ do
996+ testWidget' static check $ do
1342 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
997 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
1343 liftIO $ dmap `H.shouldBe` keyMap
998 liftIO $ dmap `H.shouldBe` keyMap
1344 it "handles postBuild correctly" $ runWD $ do
999 it "handles postBuild correctly" $ runWD $ do
1345 chan <- liftIO newChan
1000 chan <- liftIO newChan
1346− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1001+ let static = getAndCheckInitialItems (fromJust $ apply postBuildPatch keyMap)
1347 check xs = do
1002 check xs = do
1348− withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
1003+ checkInitialItems (fromMaybe undefined $ apply postBuildPatch keyMap) xs
1349 checkRemoval chan Key_Int
1004 checkRemoval chan Key_Int
1350 checkInsert chan Key_Char 'B'
1005 checkInsert chan Key_Char 'B'
1351 checkReplace chan Key_Bool True
1006 checkReplace chan Key_Bool True
1352− testWidget' preSwitchover check $ void $ do
1007+ testWidget' static check $ void $ do
1353 pb <- getPostBuild
1008 pb <- getPostBuild
1354 replace <- triggerEventWithChan chan
1009 replace <- triggerEventWithChan chan
1355 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1010 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1382,7 +1037,7 @@ tests withDebugging wdConfig caps _selenium = do
1382 it "handles postBuild correctly in prerender" $ runWD $ do
1037 it "handles postBuild correctly in prerender" $ runWD $ do
1383 chan <- liftIO newChan
1038 chan <- liftIO newChan
1384 let check = do
1039 let check = do
1385− _ <- getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1040+ _ <- getAndCheckInitialItems (fromJust $ apply postBuildPatch keyMap)
1386 checkRemoval chan Key_Int
1041 checkRemoval chan Key_Int
1387 checkInsert chan Key_Char 'B'
1042 checkInsert chan Key_Char 'B'
1388 checkReplace chan Key_Bool True
1043 checkReplace chan Key_Bool True
@@ -1393,7 +1048,7 @@ tests withDebugging wdConfig caps _selenium = do
1393 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1048 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1394 liftIO $ dmap `H.shouldBe` keyMap
1049 liftIO $ dmap `H.shouldBe` keyMap
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1051+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
1397 let textKeyInt k = "key" <> T.pack (show k)
1052 let textKeyInt k = "key" <> T.pack (show k)
1398 intMap = IntMap.fromList
1053 intMap = IntMap.fromList
1399 [ (1, "one")
1054 [ (1, "one")
@@ -1407,89 +1062,89 @@ tests withDebugging wdConfig caps _selenium = do
1408 checkItem :: WD.Element -> Text -> Text -> WD ()
1063 checkItem :: WD.Element -> Text -> Text -> WD ()
1409 checkItem li k v = do
1064 checkItem li k v = do
1410− putStrLnDebug "checkItem"
1411− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1065+ shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1412− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1066+ shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1413 checkInitialItems dm xs = do
1067 checkInitialItems dm xs = do
1414− putStrLnDebug "checkInitialItems"
1415 liftIO $ assertEqual "Wrong amount of items in DOM" (IntMap.size dm) (length xs)
1068 liftIO $ assertEqual "Wrong amount of items in DOM" (IntMap.size dm) (length xs)
1416 forM_ (zip xs (IntMap.toList dm)) $ \(e, (k, v)) -> checkItem e (textKeyInt k) v
1069 forM_ (zip xs (IntMap.toList dm)) $ \(e, (k, v)) -> checkItem e (textKeyInt k) v
1417− getAndCheckInitialItems dm = withRetry $ do
1070+ getAndCheckInitialItems dm = do
1418− putStrLnDebug "getAndCheckInitialItems"
1419 xs <- WD.findElems (WD.ByTag "li")
1071 xs <- WD.findElems (WD.ByTag "li")
1420 checkInitialItems dm xs
1072 checkInitialItems dm xs
1422 checkRemoval chan k = do
1074 checkRemoval chan k = do
1423− putStrLnDebug "checkRemoval"
1424− e <- findElemWithRetry (WD.ById $ textKeyInt k)
1075+ e <- WD.findElem (WD.ById $ textKeyInt k)
1425− liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
1077+ writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
1426 elementShouldBeRemoved e
1079 elementShouldBeRemoved e
1427 checkReplace chan k v = do
1080 checkReplace chan k v = do
1428− putStrLnDebug "checkReplace"
1429− e <- findElemWithRetry (WD.ById $ textKeyInt k)
1081+ e <- WD.findElem (WD.ById $ textKeyInt k)
1430− liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1083+ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1431 elementShouldBeRemoved e
1085 elementShouldBeRemoved e
1432− e' <- findElemWithRetry (WD.ById $ textKeyInt k)
1086+ e' <- WD.findElem (WD.ById $ textKeyInt k)
1433− withRetry $ checkItem e' (textKeyInt k) v
1087+ checkItem e' (textKeyInt k) v
1434 checkInsert chan k v = do
1088 checkInsert chan k v = do
1435− putStrLnDebug "checkInsert"
1089+ liftIO $ do
1436− liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1090+ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1437− e <- findElemWithRetry (WD.ById $ textKeyInt k)
1092+ e <- WD.findElem (WD.ById $ textKeyInt k)
1438 checkItem e (textKeyInt k) v
1093 checkItem e (textKeyInt k) v
1439 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1094 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1440− xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1095+ it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1441 chan <- liftIO newChan
1096 chan <- liftIO newChan
1442− let preSwitchover = getAndCheckInitialItems intMap
1097+ let static = getAndCheckInitialItems intMap
1443 check xs = do
1098 check xs = do
1444 checkInitialItems intMap xs
1099 checkInitialItems intMap xs
1445 checkRemoval chan 1
1100 checkRemoval chan 1
1446 checkReplace chan 2 "deux"
1101 checkReplace chan 2 "deux"
1447 checkInsert chan 4 "four"
1102 checkInsert chan 4 "four"
1448− testWidget' preSwitchover check $ void $ do
1103+ testWidget' static check $ void $ do
1449 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1104 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1450 liftIO $ im `H.shouldBe` intMap
1105 liftIO $ im `H.shouldBe` intMap
1451− xit "handles postBuild correctly" $ runWD $ do
1106+ it "handles postBuild correctly" $ runWD $ do
1452 chan <- liftIO newChan
1107 chan <- liftIO newChan
1453− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1108+ let static = getAndCheckInitialItems (fromJust $ apply postBuildPatch intMap)
1454 check xs = do
1109 check xs = do
1455− withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
1110+ checkInitialItems (fromMaybe undefined $ apply postBuildPatch intMap) xs
1456 checkRemoval chan 1
1111 checkRemoval chan 1
1457 checkInsert chan 2 "deux"
1112 checkInsert chan 2 "deux"
1458 checkReplace chan 3 "trois"
1113 checkReplace chan 3 "trois"
1459− testWidget' preSwitchover check $ void $ do
1114+ testWidget' static check $ void $ do
1460 pb <- getPostBuild
1115 pb <- getPostBuild
1461 replace <- triggerEventWithChan chan
1116 replace <- triggerEventWithChan chan
1462 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1117 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1463 liftIO $ dmap `H.shouldBe` intMap
1118 liftIO $ dmap `H.shouldBe` intMap
1464− xit "can delete/update/insert when built in prerender" $ runWD $ do
1119+ it "can delete/update/insert when built in prerender" $ runWD $ do
1465 chan <- liftIO newChan
1120 chan <- liftIO newChan
1466 let check = do
1121 let check = do
1467 _ <- getAndCheckInitialItems intMap
1122 _ <- getAndCheckInitialItems intMap
1468 checkRemoval chan 1
1123 checkRemoval chan 1
1469 checkReplace chan 2 "deux"
1124 checkReplace chan 2 "deux"
1470− checkInsert chan 4 "quatre"
1125+ checkInsert chan 3 "trois"
1471 testWidget (pure ()) check $ do
1126 testWidget (pure ()) check $ do
1472 replace <- triggerEventWithChan chan
1127 replace <- triggerEventWithChan chan
1473 prerender_ (pure ()) $ do
1128 prerender_ (pure ()) $ do
1474 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap replace
1129 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap replace
1475 liftIO $ dmap `H.shouldBe` intMap
1130 liftIO $ dmap `H.shouldBe` intMap
1476− xit "can delete/update/insert when built in immediate mode" $ runWD $ do
1131+ it "can delete/update/insert when built in immediate mode" $ runWD $ do
1477 chan <- liftIO newChan
1132 chan <- liftIO newChan
1478 let check = do
1133 let check = do
1479 _ <- getAndCheckInitialItems intMap
1134 _ <- getAndCheckInitialItems intMap
1480 checkRemoval chan 1
1135 checkRemoval chan 1
1481 checkReplace chan 2 "deux"
1136 checkReplace chan 2 "deux"
1482− checkInsert chan 4 "quatre"
1137+ checkInsert chan 3 "trois"
1483 testWidget (pure ()) check $ void $ do
1138 testWidget (pure ()) check $ void $ do
1484 pb <- getPostBuild
1139 pb <- getPostBuild
1485 runWithReplace (pure ()) $ ffor pb $ \() -> void $ do
1140 runWithReplace (pure ()) $ ffor pb $ \() -> void $ do
1486 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1141 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1487 liftIO $ dmap `H.shouldBe` intMap
1142 liftIO $ dmap `H.shouldBe` intMap
1488 -- Should be fixed by prerender changes!
1143 -- Should be fixed by prerender changes!
1489− xit "handles postBuild correctly in prerender" $ runWD $ do
1144+ it "handles postBuild correctly in prerender" $ runWD $ do
1490 chan <- liftIO newChan
1145 chan <- liftIO newChan
1491 let check = do
1146 let check = do
1492− _ <- getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1147+ _ <- getAndCheckInitialItems (fromJust $ apply postBuildPatch intMap)
1493 checkRemoval chan 1
1148 checkRemoval chan 1
1494 checkInsert chan 2 "deux"
1149 checkInsert chan 2 "deux"
1495 checkReplace chan 3 "trois"
1150 checkReplace chan 3 "trois"
@@ -1500,30 +1155,47 @@ tests withDebugging wdConfig caps _selenium = do
1500 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1155 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1501 liftIO $ dmap `H.shouldBe` intMap
1156 liftIO $ dmap `H.shouldBe` intMap
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1158+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
1504 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1159 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1505− widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
1160+ widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1506− elClass "span" "key" $ text $ textKey2 k
1161+ elClass "span" "key" $ text $ textKey k
1507 elClass "span" "value" $ text $ T.pack $ has @Show k $ show v
1162 elClass "span" "value" $ text $ T.pack $ has @Show k $ show v
1508 pure (Identity v)
1163 pure (Identity v)
1509− textKey2 :: Key2 a -> Text
1164+ textKey :: Key2 a -> Text
1510− textKey2 = \case
1165+ textKey = \case
1511 Key2_Int i -> "i" <> T.pack (show i)
1166 Key2_Int i -> "i" <> T.pack (show i)
1512 Key2_Char c -> "c" <> T.pack [c]
1167 Key2_Char c -> "c" <> T.pack [c]
1513 checkItem :: WD.Element -> Text -> Text -> WD ()
1168 checkItem :: WD.Element -> Text -> Text -> WD ()
1514 checkItem li k v = do
1169 checkItem li k v = do
1515− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1170+ shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1516− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1171+ shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1517 checkInitialItems dm xs = do
1172 checkInitialItems dm xs = do
1518 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1173 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1519− forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey2 k) (T.pack $ has @Show k $ show v)
1174+ forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
1520− getAndCheckInitialItems dm = withRetry $ do
1175+ getAndCheckInitialItems dm = do
1521 xs <- WD.findElems (WD.ByTag "li")
1176 xs <- WD.findElems (WD.ByTag "li")
1522 checkInitialItems dm xs
1177 checkInitialItems dm xs
1524− moveSpec
1179+ checkRemoval chan k = do
1525− :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1180+ e <- WD.findElem (WD.ById $ textKey k)
1526− -> H.SpecM (WdTestSession ()) ()
1181+ liftIO $ do
1182+ writeChan chan $ deleteDMapKey k
1184+ elementShouldBeRemoved e
1185+ checkReplace chan k v = do
1186+ e <- WD.findElem (WD.ById $ textKey k)
1188+ writeChan chan $ insertDMapKey k (Identity v)
1190+ elementShouldBeRemoved e
1191+ e' <- WD.findElem (WD.ById $ textKey k)
1192+ checkItem e' (textKey k) (T.pack $ show v)
1193+ checkInsert chan k v = do
1195+ writeChan chan $ insertDMapKey k (Identity v)
1197+ e <- WD.findElem (WD.ById $ textKey k)
1198+ checkItem e (textKey k) (T.pack $ show v)
1527 moveSpec testMove = do
1199 moveSpec testMove = do
1528 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
1200 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
1529 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
1201 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
@@ -1551,26 +1223,26 @@ tests withDebugging wdConfig caps _selenium = do
1552 describe "hydration" $ moveSpec $ \initMap test -> do
1224 describe "hydration" $ moveSpec $ \initMap test -> do
1553 chan <- liftIO newChan
1225 chan <- liftIO newChan
1554− let preSwitchover = getAndCheckInitialItems initMap
1226+ let static = getAndCheckInitialItems initMap
1555 check xs = do
1227 check xs = do
1556 checkInitialItems initMap xs
1228 checkInitialItems initMap xs
1557− body <- getBody
1229+ body <- WD.findElem (WD.ByTag "body")
1558 test body chan
1230 test body chan
1559− testWidget' preSwitchover check $ void $ do
1231+ testWidget' static check $ void $ do
1560 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1232 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1561 liftIO $ assertEqual "DMap" initMap dmap
1233 liftIO $ assertEqual "DMap" initMap dmap
1563 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
1235 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
1564 chan <- liftIO newChan
1236 chan <- liftIO newChan
1565 replace <- liftIO newChan
1237 replace <- liftIO newChan
1566− lock :: MVar () <- liftIO newEmptyMVar
1238+ lock <- liftIO newEmptyMVar
1567 let check = do
1239 let check = do
1568 liftIO $ do
1240 liftIO $ do
1569 writeChan replace ()
1241 writeChan replace ()
1570 takeMVar lock
1242 takeMVar lock
1571 xs <- getAndCheckInitialItems initMap
1243 xs <- getAndCheckInitialItems initMap
1572 checkInitialItems initMap xs
1244 checkInitialItems initMap xs
1573− body <- getBody
1245+ body <- WD.findElem (WD.ByTag "body")
1574 test body chan
1246 test body chan
1575 testWidget (pure ()) check $ void $ do
1247 testWidget (pure ()) check $ void $ do
1576 e <- triggerEventWithChan replace
1248 e <- triggerEventWithChan replace
@@ -1580,26 +1252,24 @@ tests withDebugging wdConfig caps _selenium = do
1580 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1252 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1581 liftIO $ assertEqual "DMap" initMap dmap
1253 liftIO $ assertEqual "DMap" initMap dmap
1583− session' "hydrating invalid HTML" $ do
1255+ describe "hydrating invalid HTML" $ session' $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1256+ it "can hydrate list in paragraph" $ runWD $ do
1585− let preSwitchover = do
1257+ let static = do
1258+ body <- WD.findElem (WD.ByTag "body")
1586− checkBodyText "before\ninner\nafter"
1259+ shouldContainText "before\ninner\nafter" body
1587 -- Two <p> tags should be present
1260 -- Two <p> tags should be present
1588− (p1, p2) <- WD.findElems (WD.ByTag "p") >>= \case
1261+ [p1, p2] <- WD.findElems (WD.ByTag "p")
1589− [p1, p2] -> pure (p1, p2)
1590− _ -> error "Unexpected number of `p` tags (expected 2)"
1591− ol <- findElemWithRetry (WD.ByTag "ol")
1262+ ol <- WD.findElem (WD.ByTag "ol")
1592 shouldContainText "before" p1
1263 shouldContainText "before" p1
1593 shouldContainText "inner" ol
1264 shouldContainText "inner" ol
1594 shouldContainText "" p2
1265 shouldContainText "" p2
1595− pure (p1, ol, p2)
1266+ pure (body, p1, ol, p2)
1596− check (p1, ol, p2) = do
1267+ check (body, p1, ol, p2) = do
1597− checkBodyText "before\ninner\nafter"
1268+ shouldContainText "before\ninner\nafter" body
1598 shouldContainText "before\ninner\nafter" p1
1269 shouldContainText "before\ninner\nafter" p1
1599 elementShouldBeRemoved ol
1270 elementShouldBeRemoved ol
1600 elementShouldBeRemoved p2
1271 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1272+ testWidget' static check $ do
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1603 -- This is deliberately invalid HTML, the browser will interpret it as
1273 -- This is deliberately invalid HTML, the browser will interpret it as
1604 -- <p>before</p><ol>inner</ol>after<p></p>
1274 -- <p>before</p><ol>inner</ol>after<p></p>
1605 el "p" $ do
1275 el "p" $ do
@@ -1607,29 +1277,6 @@ tests withDebugging wdConfig caps _selenium = do
1607 el "ol" $ text "inner"
1277 el "ol" $ text "inner"
1608 text "after"
1278 text "after"
1610− -- TODO: This test presupposes the exact set of labels that "dropdown" places in the "value" fields to distinguish options.
1611− -- This dependence on internal implementation details is undesirable in a test case, but seems fairly tricky to avoid.
1612− -- It seems expedient for the time being to expect this test case to be updated, should those implementation details ever change.
1613− session' "dropdown" $ do
1614− let doTest expectedOpts (initialValue :: Text) = do
1616− es <- findElemsWithRetry $ WD.ByTag "option"
1617− opts <- mapM fetchElement es
1618− assertEqual "missing/extra/incorrect option element(s)" expectedOpts (sort opts)
1619− testWidget doCheck doCheck $ do
1620− void $ dropdown initialValue (constDyn (("aa" :: Text) =: "aaa" <> "bb" =: "bbb")) def
1621− fetchElement e = do
1622− val <- WD.attr e "value"
1623− sel <- WD.attr e "selected"
1624− return (fromMaybe "" val, isJust sel)
1625− -- The "aa" test case is important, but a good test implementation probably needs to avoid selenium, because HTML parsers will insert a "selected" attribute on the first "option" tag if no selected attributes are present; thus as written, this erroneously succeeds on the old implementation (but properly implemented, should fail)
1626− -- Thus, it would appear that we do actually need a HTML5 or maybe XML parser for this test suite.
1627− xit "statically renders initial values (on aa)" $ runWD $ do
1628− doTest [("0",True),("1",False)] "aa"
1629− -- These tests are currently marked "pending" (by using "xit" instead of "it") because this test has a high chance of non-deterministically failing, which is a problem elsewhere in this test suite as well
1630− xit "statically renders initial values (on bb)" $ runWD $ do
1631− doTest [("0",False),("1",True)] "bb"
1633data Selenium = Selenium
1280data Selenium = Selenium
1634 { _selenium_portNumber :: PortNumber
1281 { _selenium_portNumber :: PortNumber
1635 , _selenium_stopServer :: IO ()
1282 , _selenium_stopServer :: IO ()
@@ -1646,10 +1293,11 @@ startSeleniumServer port = do
1647withSeleniumServer :: (Selenium -> IO ()) -> IO ()
1294withSeleniumServer :: (Selenium -> IO ()) -> IO ()
1648withSeleniumServer f = do
1295withSeleniumServer f = do
1296+ port <- getFreePort
1649− stopServer <- startSeleniumServer seleniumPort
1297+ stopServer <- startSeleniumServer port
1650 threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
1298 threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
1651 f $ Selenium
1299 f $ Selenium
1652− { _selenium_portNumber = seleniumPort
1300+ { _selenium_portNumber = port
1653 , _selenium_stopServer = stopServer
1301 , _selenium_stopServer = stopServer
@@ -1660,163 +1308,121 @@ triggerEventWithChan chan = do
1660 prerender_ (pure ()) $ void $ liftIO $ forkIO $ forever $ trigger =<< readChan chan
1308 prerender_ (pure ()) $ void $ liftIO $ forkIO $ forever $ trigger =<< readChan chan
1663−shouldBeWithRetryM :: (Eq a, Show a) => WD a -> a -> WD ()
1664−shouldBeWithRetryM m expected = withRetry $ do
1666− got `shouldBe` expected
1668assertAttr :: WD.Element -> Text -> Maybe Text -> WD ()
1311assertAttr :: WD.Element -> Text -> Maybe Text -> WD ()
1669assertAttr e k v = liftIO . assertEqual "Incorrect attribute value" v =<< WD.attr e k
1312assertAttr e k v = liftIO . assertEqual "Incorrect attribute value" v =<< WD.attr e k
1671elementShouldBeRemoved :: WD.Element -> WD ()
1314elementShouldBeRemoved :: WD.Element -> WD ()
1672−elementShouldBeRemoved e = withRetry $ do
1315+elementShouldBeRemoved e = do
1673 try (WD.getText e) >>= \case
1316 try (WD.getText e) >>= \case
1674 Left (WD.FailedCommand WD.StaleElementReference _) -> return ()
1317 Left (WD.FailedCommand WD.StaleElementReference _) -> return ()
1675 Left err -> throwM err
1318 Left err -> throwM err
1676 Right !_ -> liftIO $ assertFailure "Expected element to be removed, but it still exists"
1319 Right !_ -> liftIO $ assertFailure "Expected element to be removed, but it still exists"
1678shouldContainText :: Text -> WD.Element -> WD ()
1321shouldContainText :: Text -> WD.Element -> WD ()
1679−shouldContainText t = withRetry . shouldContainTextNoRetry t
1681−shouldContainTextNoRetry :: Text -> WD.Element -> WD ()
1682−shouldContainTextNoRetry t = flip shouldBe t <=< WD.getText
1322+shouldContainText t = flip shouldBe t <=< WD.getText
1684checkBodyText :: Text -> WD ()
1324checkBodyText :: Text -> WD ()
1685checkBodyText = checkTextInTag "body"
1325checkBodyText = checkTextInTag "body"
1687checkTextInTag :: Text -> Text -> WD ()
1327checkTextInTag :: Text -> Text -> WD ()
1688−checkTextInTag t expected = do
1689− e <- findElemWithRetry (WD.ByTag t)
1690− shouldContainText expected e
1328+checkTextInTag t expected = WD.findElem (WD.ByTag t) >>= shouldContainText expected
1692checkTextInId :: Text -> Text -> WD ()
1330checkTextInId :: Text -> Text -> WD ()
1693−checkTextInId i expected = do
1331+checkTextInId i expected = WD.findElem (WD.ById i) >>= shouldContainText expected
1694− e <- findElemWithRetry (WD.ById i)
1695− shouldContainText expected e
1697−findElemWithRetry :: Selector -> WD WD.Element
1698−findElemWithRetry = withRetry . WD.findElem
1700−findElemsWithRetry :: Selector -> WD [WD.Element]
1701−findElemsWithRetry = withRetry . WD.findElems
1703−getBody :: WD WD.Element
1704−getBody = WD.findElem $ WD.ByTag "body"
1706−withRetry :: forall a. WD a -> WD a
1707−withRetry a = wait 300
1708− where wait :: Int -> WD a
1710− wait n = try a >>= \case
1711− Left (e :: SomeException) -> do
1712− liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1714− Right v -> return v
1716divId :: DomBuilder t m => Text -> m a -> m a
1333divId :: DomBuilder t m => Text -> m a -> m a
1717divId i = elAttr "div" ("id" =: i)
1334divId i = elAttr "div" ("id" =: i)
1719type TestWidget js t m = (DomBuilder t m, MonadHold t m, PostBuild t m, Prerender js t m, PerformEvent t m, TriggerEvent t m, MonadFix m, MonadIO (Performable m), MonadIO m)
1336type TestWidget js t m = (DomBuilder t m, MonadHold t m, PostBuild t m, Prerender js t m, PerformEvent t m, TriggerEvent t m, MonadFix m, MonadIO (Performable m), MonadIO m)
1721−testWidgetStaticDebug
1338+testWidgetStatic
1723− -> WD b
1339+ :: WD b
1724 -- ^ Webdriver commands to run before JS runs and after hydration switchover
1340 -- ^ Webdriver commands to run before JS runs and after hydration switchover
1725 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1341 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1726 -- ^ Widget we are testing
1342 -- ^ Widget we are testing
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1344+testWidgetStatic w = testWidget (void w) w
1730-- | TODO: do something about JSExceptions not causing tests to fail
1346-- | TODO: do something about JSExceptions not causing tests to fail
1731−testWidgetDebug
1347+testWidget
1734− -> WD ()
1348+ :: WD ()
1735 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1349 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1737 -- ^ Webdriver commands to run after hydration switchover
1351 -- ^ Webdriver commands to run after hydration switchover
1738 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1352 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1739 -- ^ Widget we are testing
1353 -- ^ Widget we are testing
1741−testWidgetDebug hardFailure withDebugging beforeJS afterSwitchover =
1742− testWidgetDebug' hardFailure withDebugging beforeJS (const afterSwitchover)
1355+testWidget beforeJS afterSwitchover = testWidget' beforeJS (const afterSwitchover)
1744−data HydrationFailedException = HydrationFailedException deriving Show
1745−instance Exception HydrationFailedException
1747-- | TODO: do something about JSExceptions not causing tests to fail
1357-- | TODO: do something about JSExceptions not causing tests to fail
1748−testWidgetDebug'
1358+testWidget'
1751− -> WD a
1359+ :: WD a
1752 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1360 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1753 -> (a -> WD b)
1361 -> (a -> WD b)
1754 -- ^ Webdriver commands to run after hydration switchover
1362 -- ^ Webdriver commands to run after hydration switchover
1755 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1363 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1756 -- ^ Widget we are testing (contents of body)
1364 -- ^ Widget we are testing (contents of body)
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1366+testWidget' beforeJS afterSwitchover bodyWidget = maybe (error "test timed out") pure <=< timeout testTimeLimit $ do
1759− let putStrLnDebug :: MonadIO m => Text -> m ()
1760− putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
1761− staticApp = do
1367+ let staticApp = do
1762 el "head" $ pure ()
1368 el "head" $ pure ()
1763 el "body" $ do
1369 el "body" $ do
1764 bodyWidget
1370 bodyWidget
1765 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1371 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1766− putStrLnDebug "rendering static"
1767− ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1372+ ((), html) <- liftIO $ renderStatic staticApp
1768− putStrLnDebug "rendered static"
1769 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1373 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
1771 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
1374 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
1772 let entryPoint = do
1375 let entryPoint = do
1773− putStrLnDebug "taking waitBeforeJS"
1774 liftIO $ takeMVar waitBeforeJS
1376 liftIO $ takeMVar waitBeforeJS
1775− let switchOverAction = do
1776− putStrLnDebug "switchover syncPoint"
1778− putStrLnDebug "putting waitUntilSwitchover"
1779− liftIO $ putMVar waitUntilSwitchover ()
1377+ mainHydrationWidgetWithSwitchoverAction (liftIO $ putMVar waitUntilSwitchover ()) (pure ()) bodyWidget
1780− putStrLnDebug "put waitUntilSwitchover"
1781− putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1783− putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
1784 syncPoint
1378 syncPoint
1785− application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
1379+ application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse ->
1786− putStrLnDebug "sending response"
1787− r <- sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1380+ sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1788− putStrLnDebug "sent response"
1381+ port <- getFreePort
1790 waitJSaddle <- liftIO newEmptyMVar
1382 waitJSaddle <- liftIO newEmptyMVar
1791 let settings = foldr ($) Warp.defaultSettings
1383 let settings = foldr ($) Warp.defaultSettings
1792− [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
1384+ [ Warp.setPort $ fromIntegral (toInteger port)
1793− , Warp.setBeforeMainLoop $ do
1385+ , Warp.setBeforeMainLoop $ putMVar waitJSaddle ()
1794− putStrLnDebug "putting waitJSaddle"
1795− putMVar waitJSaddle ()
1796− putStrLnDebug "put waitJSaddle"
1798 -- hSilence to get rid of ConnectionClosed logs
1387 -- hSilence to get rid of ConnectionClosed logs
1799− silenceIfDebug = if withDebugging then id else hSilence [stderr]
1800− jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1388+ jsaddleWarp = forkIO $ hSilence [stderr] $ Warp.runSettings settings application
1801− withAsync' jsaddleWarp $ do
1389+ jsaddleTid <- liftIO jsaddleWarp
1802− putStrLnDebug "taking waitJSaddle"
1803− liftIO $ takeMVar waitJSaddle
1390+ liftIO $ takeMVar waitJSaddle
1804− putStrLnDebug "opening page"
1805− WD.openPage $ "http://localhost:" <> show jsaddlePort
1391+ WD.openPage $ "http://localhost:" <> show port
1806− putStrLnDebug "running beforeJS"
1807− a <- beforeJS
1392+ a <- beforeJS
1808− putStrLnDebug "putting waitBeforeJS"
1809− liftIO $ putMVar waitBeforeJS ()
1393+ liftIO $ putMVar waitBeforeJS ()
1810− putStrLnDebug "taking waitUntilSwitchover"
1394+ liftIO $ takeMVar waitUntilSwitchover
1811− liftIO $ takeMVar waitUntilSwitchover
1395+ liftIO $ threadDelay 100000 -- wait a bit
1812− putStrLnDebug "running afterSwitchover"
1813− afterSwitchover a
1396+ b <- afterSwitchover a
1397+ liftIO $ killThread jsaddleTid
1815−withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
1400+
1816−withAsync' f g = bracket
1401+-- TODO: Should this be part of more widely used module?
1817− (liftIO $ Async.async f)
1402+-- TODO: Ensure port is not taken
1818− (liftIO . Async.uninterruptibleCancel)
1403+getFreePort :: MonadIO m => m PortNumber
1819− (const g)
1404+getFreePort = liftIO $ withSocketsDo $ do
1405+ addr:_ <- getAddrInfo (Just defaultHints) (Just "127.0.0.1") (Just "0")
1406+ bracket (open addr) close socketPort
1409+ sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
1410+ bind sock (addrAddress addr)
1413+testWidgetDebug :: MonadIO n => (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> n ()
1414+testWidgetDebug bodyWidget = liftIO $ do
1416+ el "head" $ pure ()
1419+ el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1420+ ((), html) <- renderStatic staticApp
1421+ let entryPoint = do
1422+ mainHydrationWidgetWithSwitchoverAction (pure ()) (pure ()) bodyWidget
1424+ application <- jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1425+ Warp.runSettings (Warp.setPort 3911 Warp.defaultSettings) application
1821data Key2 a where
1427data Key2 a where
1822 Key2_Int :: Int -> Key2 Int
1428 Key2_Int :: Int -> Key2 Int
@@ -1826,3 +1432,12 @@ deriveGEq ''Key2
1826deriveGCompare ''Key2
1432deriveGCompare ''Key2
1827deriveGShow ''Key2
1433deriveGShow ''Key2
1828deriveArgDict ''Key2
1434deriveArgDict ''Key2
1436+instance ShowTag Key2 Identity where
1437+ showTaggedPrec = \case
1438+ Key2_Int _ -> showsPrec
1439+ Key2_Char _ -> showsPrec
1441+instance EqTag Key2 Identity where
1442+ eqTagged (Key2_Int _) (Key2_Int _) = (==)
1443+ eqTagged (Key2_Char _) (Key2_Char _) = (==)