@@ -20,14 +20,6 @@
2020
2121{-# OPTIONS_GHC -fno-warn-orphans #-}
2222
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.
30−
3123import Prelude hiding (fail)
3224import Control.Concurrent
3325import qualified Control.Concurrent.Async as Async
@@ -154,13 +146,13 @@ main = do
154146 withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
155147 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156148 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
149+ hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
158150
159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
151+tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec
160152tests withDebugging wdConfig caps _selenium = do
161153 let putStrLnDebug :: MonadIO m => Text -> m ()
162154 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163− session' t = sessionWith wdConfig t . using caps
155+ session' = sessionWith wdConfig "" . using (map (,"") caps)
164156 runWD m = runWDOptions (WdOptions False) $ do
165157 putStrLnDebug "before"
166158 r <- m
@@ -169,10 +161,10 @@ tests withDebugging wdConfig caps _selenium = do
169161 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170162 testWidgetStatic = testWidgetStaticDebug withDebugging
171163 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172− testWidget = testWidgetDebug True withDebugging
164+ testWidget = testWidgetDebug withDebugging
173165 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
166+ testWidget' = testWidgetDebug' withDebugging
167+ describe "text" $ session' $ do
176168 it "works" $ runWD $ do
177169 testWidgetStatic (checkBodyText "hello world") $ do
178170 text "hello world"
@@ -233,7 +225,7 @@ tests withDebugging wdConfig caps _selenium = do
233225 click <- button ""
234226 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
235227
236− session' "element" $ do
228+ describe "element" $ session' $ do
237229 it "works with domEvent Click" $ runWD $ do
238230 clickedRef <- liftIO $ newRef False
239231 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
@@ -297,78 +289,21 @@ tests withDebugging wdConfig caps _selenium = do
297289 let click = domEvent Click e
298290 return ()
299291
300− session' "inputElement" $ do
301− describe "static renderer" $ 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"
306− pure e
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"
315− pure e
316− checkHydrated e = do
317− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
318− testWidget' checkStatic checkHydrated $ do
319− pb <- getPostBuild
320− _ <- inputElement $ def
321− & inputElementConfig_initialValue .~ "test"
322− & inputElementConfig_setValue .~ ("test-updated" <$ pb)
323− pure ()
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"
329− pure e
330− checkValue e = do
331− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
332− WD.moveToCenter e
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
343− pure ()
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"
348− pure e
349− checkValue e = do
350− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
351− testWidget' checkStatic checkValue $ do
352− pb <- getPostBuild
353− _ <- inputElement $ def
354− & initialAttributes .~ "type" =: "checkbox"
355− & inputElementConfig_initialChecked .~ False
356− & inputElementConfig_setChecked .~ (True <$ pb)
357− pure ()
358− describe "hydration" $ do
292+ describe "inputElement" $ do
293+ describe "hydration" $ session' $ do
359294 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
295+ inputRef <- newRef ("" :: Text)
361296 testWidget'
362297 (do
363298 e <- findElemWithRetry $ WD.ByTag "input"
364− WD.sendKeys "world" e
299+ WD.sendKeys "hello world" e
365300 pure e)
366301 (\e -> do
367302 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368303 WD.click =<< findElemWithRetry (WD.ByTag "button")
369304 readRef inputRef `shouldBeWithRetryM` "hello world"
370305 ) $ do
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
306+ e <- inputElement def
372307 click <- button "save"
373308 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374309 it "captures user input after switchover" $ runWD $ do
@@ -425,49 +360,24 @@ tests withDebugging wdConfig caps _selenium = do
425360 checkedByUIRef <- newRef False
426361 checkedRef <- newRef False
427362 setCheckedChan <- liftIO newChan
428− let checkStatic = do
429− e <- findElemWithRetry $ WD.ByTag "input"
430− WD.attr e "checked" `shouldBeWithRetryM` Nothing
431− pure e
432− checkValue e = do
363+ let checkValue = do
433364 readRef checkedByUIRef `shouldBeWithRetryM` False
434365 readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
366+ e <- findElemWithRetry $ WD.ByTag "input"
436367 WD.moveToCenter e
437368 WD.click e
438369 readRef checkedByUIRef `shouldBeWithRetryM` True
439370 readRef checkedRef `shouldBeWithRetryM` True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441371 liftIO $ writeChan setCheckedChan False
442372 readRef checkedByUIRef `shouldBeWithRetryM` True
443373 readRef checkedRef `shouldBeWithRetryM` False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
374+ testWidget (pure ()) checkValue $ do
446375 setChecked <- triggerEventWithChan setCheckedChan
447376 e <- inputElement $ def
448377 & initialAttributes .~ "type" =: "checkbox"
449378 & inputElementConfig_setChecked .~ setChecked
450379 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451380 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
458− WD.moveToCenter e
459− WD.click e
460− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
461− pure e
462− checkValue e = do
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)
471381 it "captures file uploads" $ runWD $ do
472382 filesRef :: IORef [Text] <- newRef []
473383 let uploadFile = do
@@ -483,117 +393,8 @@ tests withDebugging wdConfig caps _selenium = do
483393 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484394 names <- liftJSM $ traverse File.getName fs
485395 liftIO $ writeRef filesRef names
486− it "fires _input event if the user altered the value before hydration" $ runWD $ do
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"
494− pure e
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"
508− pure e
509− checkHydrated e = do
510− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
511− readRef input `shouldBeWithRetryM` Nothing
512− testWidget' checkStatic checkHydrated $ do
513− pb <- getPostBuild
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
517− let checkBoth = 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
523− pb <- getPostBuild
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
543− pure ()
544− testWidget' checkStatic checkHydrated $ do
545− pb <- getPostBuild
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
559− pure (input, p)
560− checkHydrated (input, p) = do
561− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
562− shouldContainText "pbabc" p
563− pure ()
564− testWidget' checkStatic checkHydrated $ do
565− pb <- getPostBuild
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, ())
572− checkStatic = do
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"]
582− pure (input, p)
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
588− pure ()
589− testWidget' checkStatic checkHydrated $ do
590− liftIO $ writeRef valRef []
591− pb <- getPostBuild
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
396+
397+ describe "hydration/immediate" $ session' $ do
597398 it "captures user input after switchover" $ runWD $ do
598399 inputRef :: IORef Text <- newRef ""
599400 let checkValue = do
@@ -673,31 +474,8 @@ tests withDebugging wdConfig caps _selenium = do
673474 names <- liftJSM $ traverse File.getName fs
674475 liftIO $ writeRef filesRef names
675476
676− session' "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"
682− pure e
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"
691− pure e
692− checkHydrated e = do
693− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
694− testWidget' checkStatic checkHydrated $ do
695− pb <- getPostBuild
696− _ <- textAreaElement $ def
697− & textAreaElementConfig_initialValue .~ "test"
698− & textAreaElementConfig_setValue .~ ("test-updated" <$ pb)
699− pure ()
700− describe "hydration" $ do
477+ describe "textAreaElement" $ do
478+ describe "hydration" $ session' $ do
701479 it "doesn't wipe user input when switching over" $ runWD $ do
702480 inputRef <- newRef ("" :: Text)
703481 testWidget'
@@ -763,90 +541,8 @@ tests withDebugging wdConfig caps _selenium = do
763541 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764542 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765543 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"
774− pure e
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"
788− pure e
789− checkHydrated e = do
790− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
791− readRef textarea `shouldBeWithRetryM` Nothing
792− testWidget' checkStatic checkHydrated $ do
793− pb <- getPostBuild
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
797− let checkBoth = 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
803− pb <- getPostBuild
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
823− pure ()
824− testWidget' checkStatic checkHydrated $ do
825− pb <- getPostBuild
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
839− pure (textarea, p)
840− checkHydrated (textarea, p) = do
841− WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
842− shouldContainText "pbabc" p
843− pure ()
844− testWidget' checkStatic checkHydrated $ do
845− pb <- getPostBuild
846− e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
847− el "p" $ dynText $ _textAreaElement_value e
848544
849− describe "hydration/immediate" $ do
545+ describe "hydration/immediate" $ session' $ do
850546 it "captures user input after switchover" $ runWD $ do
851547 inputRef :: IORef Text <- newRef ""
852548 let checkValue = do
@@ -888,13 +584,13 @@ tests withDebugging wdConfig caps _selenium = do
888584 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889585 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890586
891− session' "selectElement" $ do
587+ describe "selectElement" $ do
892588 let options :: DomBuilder t m => m ()
893589 options = do
894590 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895591 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896592 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
593+ describe "hydration" $ session' $ do
898594 it "sets initial value correctly" $ runWD $ do
899595 inputRef <- newRef ("" :: Text)
900596 let setup = do
@@ -968,7 +664,7 @@ tests withDebugging wdConfig caps _selenium = do
968664 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969665 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970666
971− describe "hydration/immediate" $ do
667+ describe "hydration/immediate" $ session' $ do
972668 it "captures user input after switchover" $ runWD $ do
973669 inputRef :: IORef Text <- newRef ""
974670 let checkValue = do
@@ -1014,7 +710,7 @@ tests withDebugging wdConfig caps _selenium = do
1014710 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015711 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016712
1017− session' "prerender" $ do
713+ describe "prerender" $ session' $ do
1018714 it "works in simple case" $ runWD $ do
1019715 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020716 prerender_ (text "One") (text "Two")
@@ -1083,7 +779,7 @@ tests withDebugging wdConfig caps _selenium = do
1083779 prerender_ (pure ()) (liftIO $ trigger "Client")
1084780 textNode $ TextNodeConfig "Initial" $ Just e
1085781
1086− session' "namespaces" $ do
782+ describe "namespaces" $ session' $ do
1087783 it "dyn can be nested in namespaced widget" $ runWD $ do
1088784 testWidget (pure ()) (checkTextInTag "svg" "one") $ do
1089785 let svgRootCfg = def
@@ -1092,7 +788,7 @@ tests withDebugging wdConfig caps _selenium = do
1092788 void $ element "svg" svgRootCfg $ do
1093789 dyn_ $ text "one" <$ pure ()
1094790
1095− session' "runWithReplace" $ do
791+ describe "runWithReplace" $ session' $ do
1096792 it "works" $ runWD $ do
1097793 replaceChan :: Chan Text <- liftIO newChan
1098794 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -1266,9 +962,7 @@ tests withDebugging wdConfig caps _selenium = do
1266962 _ <- runWithReplace (text "inner1" *> comment "replace-end-0") $ text "inner2" <$ replace
1267963 text "|after"
1268964 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
965+ it "ignores missing ending bracketing comments" $ runWD $ do
1272966 replaceChan :: Chan () <- liftIO newChan
1273967 let
1274968 preSwitchover = do
@@ -1290,7 +984,7 @@ tests withDebugging wdConfig caps _selenium = do
1290984 _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1291985 text "|after"
1292986
1293− session' "traverseDMapWithKeyWithAdjust" $ do
987+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294988 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295989 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296990 elClass "span" "key" $ text $ textKey k
@@ -1393,7 +1087,7 @@ tests withDebugging wdConfig caps _selenium = do
13931087 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
13941088 liftIO $ dmap `H.shouldBe` keyMap
13951089
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1090+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
13971091 let textKeyInt k = "key" <> T.pack (show k)
13981092 intMap = IntMap.fromList
13991093 [ (1, "one")
@@ -1500,7 +1194,7 @@ tests withDebugging wdConfig caps _selenium = do
15001194 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
15011195 liftIO $ dmap `H.shouldBe` intMap
15021196
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1197+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
15041198 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
15051199 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
15061200 elClass "span" "key" $ text $ textKey2 k
@@ -1580,8 +1274,8 @@ tests withDebugging wdConfig caps _selenium = do
15801274 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15811275 liftIO $ assertEqual "DMap" initMap dmap
15821276
1583− session' "hydrating invalid HTML" $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1277+ describe "hydrating invalid HTML" $ session' $ do
1278+ it "can hydrate list in paragraph" $ runWD $ do
15851279 let preSwitchover = do
15861280 checkBodyText "before\ninner\nafter"
15871281 -- Two <p> tags should be present
@@ -1598,8 +1292,7 @@ tests withDebugging wdConfig caps _selenium = do
15981292 shouldContainText "before\ninner\nafter" p1
15991293 elementShouldBeRemoved ol
16001294 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1295+ testWidget' preSwitchover check $ do
16031296 -- This is deliberately invalid HTML, the browser will interpret it as
16041297 -- <p>before</p><ol>inner</ol>after<p></p>
16051298 el "p" $ do
@@ -1610,7 +1303,7 @@ tests withDebugging wdConfig caps _selenium = do
16101303 -- TODO: This test presupposes the exact set of labels that "dropdown" places in the "value" fields to distinguish options.
16111304 -- This dependence on internal implementation details is undesirable in a test case, but seems fairly tricky to avoid.
16121305 -- 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
1306+ describe "dropdown" $ session' $ do
16141307 let doTest expectedOpts (initialValue :: Text) = do
16151308 let doCheck = do
16161309 es <- findElemsWithRetry $ WD.ByTag "option"
@@ -1725,12 +1418,11 @@ testWidgetStaticDebug
17251418 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17261419 -- ^ Widget we are testing
17271420 -> WD b
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1421+testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
17291422
17301423-- | TODO: do something about JSExceptions not causing tests to fail
17311424testWidgetDebug
17321425 :: Bool
1733− -> Bool
17341426 -> WD ()
17351427 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17361428 -> WD b
@@ -1738,16 +1430,12 @@ testWidgetDebug
17381430 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17391431 -- ^ Widget we are testing
17401432 -> WD b
1741−testWidgetDebug hardFailure withDebugging beforeJS afterSwitchover =
1742− testWidgetDebug' hardFailure withDebugging beforeJS (const afterSwitchover)
1743−
1744−data HydrationFailedException = HydrationFailedException deriving Show
1745−instance Exception HydrationFailedException
1433+testWidgetDebug withDebugging beforeJS afterSwitchover =
1434+ testWidgetDebug' withDebugging beforeJS (const afterSwitchover)
17461435
17471436-- | TODO: do something about JSExceptions not causing tests to fail
17481437testWidgetDebug'
17491438 :: Bool
1750− -> Bool
17511439 -> WD a
17521440 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17531441 -> (a -> WD b)
@@ -1755,7 +1443,7 @@ testWidgetDebug'
17551443 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17561444 -- ^ Widget we are testing (contents of body)
17571445 -> WD b
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1446+testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
17591447 let putStrLnDebug :: MonadIO m => Text -> m ()
17601448 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
17611449 staticApp = do
@@ -1767,7 +1455,6 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17671455 ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
17681456 putStrLnDebug "rendered static"
17691457 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
17711458 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
17721459 let entryPoint = do
17731460 putStrLnDebug "taking waitBeforeJS"
@@ -1779,7 +1466,7 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17791466 liftIO $ putMVar waitUntilSwitchover ()
17801467 putStrLnDebug "put waitUntilSwitchover"
17811468 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1469+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
17831470 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
17841471 syncPoint
17851472 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do