@@ -1,9 +1,13 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
12{-# LANGUAGE BangPatterns #-}
3+{-# LANGUAGE StandaloneDeriving #-}
4+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5+{-# LANGUAGE UndecidableInstances #-}
26{-# LANGUAGE ConstraintKinds #-}
7+{-# LANGUAGE CPP #-}
38{-# LANGUAGE FlexibleContexts #-}
49{-# LANGUAGE FlexibleInstances #-}
510{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
711{-# LANGUAGE LambdaCase #-}
812{-# LANGUAGE MultiParamTypeClasses #-}
913{-# LANGUAGE OverloadedStrings #-}
@@ -11,43 +15,26 @@
1115{-# LANGUAGE RankNTypes #-}
1216{-# LANGUAGE RecursiveDo #-}
1317{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
1518{-# LANGUAGE TemplateHaskell #-}
1619{-# LANGUAGE TupleSections #-}
1720{-# LANGUAGE TypeApplications #-}
1821{-# LANGUAGE TypeFamilies #-}
19−{-# LANGUAGE UndecidableInstances #-}
20−
21−{-# 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−
31−import Prelude hiding (fail)
3223import Control.Concurrent
33−import qualified Control.Concurrent.Async as Async
34−import Control.Lens.Operators
35−import Control.Monad hiding (fail)
24+import Control.Monad
3625import Control.Monad.Catch
37−import Control.Monad.Fail
3826import Control.Monad.Fix
3927import Control.Monad.IO.Class
4028import Control.Monad.Ref
4129import Data.Constraint.Extras
4230import Data.Constraint.Extras.TH
4331import Data.Dependent.Map (DMap)
44−import Data.Dependent.Sum (DSum(..), (==>))
32+import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
4533import Data.Functor.Identity
4634import Data.Functor.Misc
4735import Data.GADT.Compare.TH
4836import Data.GADT.Show.TH
4937import Data.IORef (IORef)
50−import Data.List (sort)
5138import Data.Maybe
5239import Data.Proxy
5340import Data.Text (Text)
@@ -58,7 +45,6 @@ import Network.Socket
5845import Network.Wai
5946import Network.WebSockets
6047import Reflex.Dom.Core
61−import Reflex.Dom.Widget.Input (dropdown)
6248import Reflex.Patch.DMapWithMove
6349import System.Directory
6450import System.Environment
@@ -67,7 +53,7 @@ import System.IO.Silently
6753import System.IO.Temp
6854import System.Process
6955import System.Which (staticWhich)
70−import qualified Test.HUnit as HUnit
56+import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
7157import qualified Test.Hspec as H
7258import qualified Test.Hspec.Core.Spec as H
7359import Test.Hspec (xit)
@@ -89,9 +75,6 @@ import qualified Test.WebDriver.Capabilities as WD
8975import Test.Util.ChromeFlags
9076import Test.Util.UnshareNetwork
9177
92−-- ORPHAN: https://github.com/kallisti-dev/hs-webdriver/pull/167
93−deriving instance MonadMask WD
94−
9578chromium :: FilePath
9679chromium = $(staticWhich "chromium")
9780
@@ -107,14 +90,11 @@ instance MonadRef WD where
10790 writeRef r = WD . writeRef r
10891
10992assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110−assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
93+assertEqual a b = liftIO . HUnit.assertEqual a b
11194
11295assertFailure :: MonadIO m => String -> m ()
11396assertFailure = liftIO . HUnit.assertFailure
11497
115−assertBool :: (MonadIO m) => String -> Bool -> m ()
116−assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117−
11898chromeConfig :: Text -> [Text] -> WD.WDConfig
11999chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
120100
@@ -141,11 +121,9 @@ deriveGEq ''DKey
141121deriveGCompare ''DKey
142122deriveGShow ''DKey
143123
144−deriving instance MonadFail WD
145−
146124main :: IO ()
147125main = do
148− unshareNetwork
126+ unshareNetork
149127 isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
150128 withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
151129 withSeleniumServer $ \selenium -> do
@@ -154,13 +132,13 @@ main = do
154132 withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
155133 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156134 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
135+ hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
158136
159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
137+tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec
160138tests withDebugging wdConfig caps _selenium = do
161139 let putStrLnDebug :: MonadIO m => Text -> m ()
162140 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163− session' t = sessionWith wdConfig t . using caps
141+ session' = sessionWith wdConfig "" . using (map (,"") caps)
164142 runWD m = runWDOptions (WdOptions False) $ do
165143 putStrLnDebug "before"
166144 r <- m
@@ -169,10 +147,10 @@ tests withDebugging wdConfig caps _selenium = do
169147 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170148 testWidgetStatic = testWidgetStaticDebug withDebugging
171149 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172− testWidget = testWidgetDebug True withDebugging
150+ testWidget = testWidgetDebug withDebugging
173151 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
152+ testWidget' = testWidgetDebug' withDebugging
153+ describe "text" $ session' $ do
176154 it "works" $ runWD $ do
177155 testWidgetStatic (checkBodyText "hello world") $ do
178156 text "hello world"
@@ -233,7 +211,7 @@ tests withDebugging wdConfig caps _selenium = do
233211 click <- button ""
234212 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
235213
236− session' "element" $ do
214+ describe "element" $ session' $ do
237215 it "works with domEvent Click" $ runWD $ do
238216 clickedRef <- liftIO $ newRef False
239217 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
@@ -297,78 +275,21 @@ tests withDebugging wdConfig caps _selenium = do
297275 let click = domEvent Click e
298276 return ()
299277
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
278+ describe "inputElement" $ do
279+ describe "hydration" $ session' $ do
359280 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
281+ inputRef <- newRef ("" :: Text)
361282 testWidget'
362283 (do
363284 e <- findElemWithRetry $ WD.ByTag "input"
364− WD.sendKeys "world" e
285+ WD.sendKeys "hello world" e
365286 pure e)
366287 (\e -> do
367288 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368289 WD.click =<< findElemWithRetry (WD.ByTag "button")
369290 readRef inputRef `shouldBeWithRetryM` "hello world"
370291 ) $ do
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
292+ e <- inputElement def
372293 click <- button "save"
373294 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374295 it "captures user input after switchover" $ runWD $ do
@@ -425,49 +346,24 @@ tests withDebugging wdConfig caps _selenium = do
425346 checkedByUIRef <- newRef False
426347 checkedRef <- newRef False
427348 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
349+ let checkValue = do
433350 readRef checkedByUIRef `shouldBeWithRetryM` False
434351 readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
352+ e <- findElemWithRetry $ WD.ByTag "input"
436353 WD.moveToCenter e
437354 WD.click e
438355 readRef checkedByUIRef `shouldBeWithRetryM` True
439356 readRef checkedRef `shouldBeWithRetryM` True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441357 liftIO $ writeChan setCheckedChan False
442358 readRef checkedByUIRef `shouldBeWithRetryM` True
443359 readRef checkedRef `shouldBeWithRetryM` False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
360+ testWidget (pure ()) checkValue $ do
446361 setChecked <- triggerEventWithChan setCheckedChan
447362 e <- inputElement $ def
448363 & initialAttributes .~ "type" =: "checkbox"
449364 & inputElementConfig_setChecked .~ setChecked
450365 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451366 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)
471367 it "captures file uploads" $ runWD $ do
472368 filesRef :: IORef [Text] <- newRef []
473369 let uploadFile = do
@@ -483,117 +379,8 @@ tests withDebugging wdConfig caps _selenium = do
483379 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484380 names <- liftJSM $ traverse File.getName fs
485381 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
382+
383+ describe "hydration/immediate" $ session' $ do
597384 it "captures user input after switchover" $ runWD $ do
598385 inputRef :: IORef Text <- newRef ""
599386 let checkValue = do
@@ -673,31 +460,8 @@ tests withDebugging wdConfig caps _selenium = do
673460 names <- liftJSM $ traverse File.getName fs
674461 liftIO $ writeRef filesRef names
675462
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
463+ describe "textAreaElement" $ do
464+ describe "hydration" $ session' $ do
701465 it "doesn't wipe user input when switching over" $ runWD $ do
702466 inputRef <- newRef ("" :: Text)
703467 testWidget'
@@ -763,90 +527,8 @@ tests withDebugging wdConfig caps _selenium = do
763527 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764528 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765529 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
848530
849− describe "hydration/immediate" $ do
531+ describe "hydration/immediate" $ session' $ do
850532 it "captures user input after switchover" $ runWD $ do
851533 inputRef :: IORef Text <- newRef ""
852534 let checkValue = do
@@ -888,13 +570,13 @@ tests withDebugging wdConfig caps _selenium = do
888570 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889571 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890572
891− session' "selectElement" $ do
573+ describe "selectElement" $ do
892574 let options :: DomBuilder t m => m ()
893575 options = do
894576 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895577 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896578 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
579+ describe "hydration" $ session' $ do
898580 it "sets initial value correctly" $ runWD $ do
899581 inputRef <- newRef ("" :: Text)
900582 let setup = do
@@ -968,7 +650,7 @@ tests withDebugging wdConfig caps _selenium = do
968650 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969651 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970652
971− describe "hydration/immediate" $ do
653+ describe "hydration/immediate" $ session' $ do
972654 it "captures user input after switchover" $ runWD $ do
973655 inputRef :: IORef Text <- newRef ""
974656 let checkValue = do
@@ -1014,7 +696,7 @@ tests withDebugging wdConfig caps _selenium = do
1014696 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015697 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016698
1017− session' "prerender" $ do
699+ describe "prerender" $ session' $ do
1018700 it "works in simple case" $ runWD $ do
1019701 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020702 prerender_ (text "One") (text "Two")
@@ -1059,9 +741,9 @@ tests withDebugging wdConfig caps _selenium = do
1059741 pb <- getPostBuild
1060742 performEvent_ $ liftIO (putMVar lock ()) <$ pb
1061743 it "result Dynamic is updated *after* switchover" $ runWD $ do
1062− let preSwitchover = checkBodyText "PostBuild"
744+ let static = checkBodyText "PostBuild"
1063745 check = checkBodyText "Client"
1064− testWidget preSwitchover check $ void $ do
746+ testWidget static check $ void $ do
1065747 d <- prerender (pure "Initial") (pure "Client")
1066748 pb <- getPostBuild
1067749 initial <- sample $ current d
@@ -1069,30 +751,21 @@ tests withDebugging wdConfig caps _selenium = do
1069751 -- This essentially checks that the client IO runs *after* switchover/postBuild,
1070752 -- thus can't create conflicting DOM
1071753 it "can't exploit IO to break hydration" $ runWD $ do
1072− let preSwitchover = checkBodyText "Initial"
1073− testWidgetStatic preSwitchover $ void $ do
754+ let static = checkBodyText "Initial"
755+ testWidgetStatic static $ void $ do
1074756 ref <- liftIO $ newRef "Initial"
1075757 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1076758 text <=< liftIO $ readRef ref
1077759 -- As above, so below
1078760 it "can't exploit triggerEvent to break hydration" $ runWD $ do
1079− let preSwitchover = checkBodyText "Initial"
761+ let static = checkBodyText "Initial"
1080762 check = checkBodyText "Client"
1081− testWidget preSwitchover check $ void $ do
763+ testWidget static check $ void $ do
1082764 (e, trigger) <- newTriggerEvent
1083765 prerender_ (pure ()) (liftIO $ trigger "Client")
1084766 textNode $ TextNodeConfig "Initial" $ Just e
1085767
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 ()
1094−
1095− session' "runWithReplace" $ do
768+ describe "runWithReplace" $ session' $ do
1096769 it "works" $ runWD $ do
1097770 replaceChan :: Chan Text <- liftIO newChan
1098771 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -1236,61 +909,7 @@ tests withDebugging wdConfig caps _selenium = do
1236909 , el "span" . text <$> replace
1237910 ]
1238911
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
1242− let
1243− preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1244− check () = do
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
1250− el "div" $ do
1251− text "before|"
1252− _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1253− text "|after"
1254− it "ignores extra ending bracketing comment" $ runWD $ do
1255− replaceChan :: Chan () <- liftIO newChan
1256− let
1257− preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0--><!--replace-end-0-->|after"
1258− check () = do
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
1264− el "div" $ do
1265− text "before|"
1266− _ <- runWithReplace (text "inner1" *> comment "replace-end-0") $ text "inner2" <$ replace
1267− text "|after"
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
1273− let
1274− preSwitchover = do
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
1282− check () = do
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
1288− el "div" $ do
1289− text "before|"
1290− _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1291− text "|after"
1292−
1293− session' "traverseDMapWithKeyWithAdjust" $ do
912+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294913 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295914 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296915 elClass "span" "key" $ text $ textKey k
@@ -1330,26 +949,26 @@ tests withDebugging wdConfig caps _selenium = do
1330949 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1331950 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1332951 chan <- liftIO newChan
1333− let preSwitchover :: WD [WD.Element]
1334− preSwitchover = getAndCheckInitialItems keyMap
952+ let static :: WD [WD.Element]
953+ static = getAndCheckInitialItems keyMap
1335954 check :: [WD.Element] -> WD ()
1336955 check xs = do
1337956 checkInitialItems keyMap xs
1338957 checkRemoval chan Key_Int
1339958 checkReplace chan Key_Char 'B'
1340959 checkInsert chan Key_Bool True
1341− testWidget' preSwitchover check $ do
960+ testWidget' static check $ do
1342961 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
1343962 liftIO $ dmap `H.shouldBe` keyMap
1344963 it "handles postBuild correctly" $ runWD $ do
1345964 chan <- liftIO newChan
1346− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
965+ let static = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1347966 check xs = do
1348967 withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
1349968 checkRemoval chan Key_Int
1350969 checkInsert chan Key_Char 'B'
1351970 checkReplace chan Key_Bool True
1352− testWidget' preSwitchover check $ void $ do
971+ testWidget' static check $ void $ do
1353972 pb <- getPostBuild
1354973 replace <- triggerEventWithChan chan
1355974 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1393,7 +1012,7 @@ tests withDebugging wdConfig caps _selenium = do
13931012 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
13941013 liftIO $ dmap `H.shouldBe` keyMap
13951014
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1015+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
13971016 let textKeyInt k = "key" <> T.pack (show k)
13981017 intMap = IntMap.fromList
13991018 [ (1, "one")
@@ -1439,24 +1058,24 @@ tests withDebugging wdConfig caps _selenium = do
14391058 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
14401059 xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
14411060 chan <- liftIO newChan
1442− let preSwitchover = getAndCheckInitialItems intMap
1061+ let static = getAndCheckInitialItems intMap
14431062 check xs = do
14441063 checkInitialItems intMap xs
14451064 checkRemoval chan 1
14461065 checkReplace chan 2 "deux"
14471066 checkInsert chan 4 "four"
1448− testWidget' preSwitchover check $ void $ do
1067+ testWidget' static check $ void $ do
14491068 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
14501069 liftIO $ im `H.shouldBe` intMap
14511070 xit "handles postBuild correctly" $ runWD $ do
14521071 chan <- liftIO newChan
1453− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1072+ let static = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
14541073 check xs = do
14551074 withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
14561075 checkRemoval chan 1
14571076 checkInsert chan 2 "deux"
14581077 checkReplace chan 3 "trois"
1459− testWidget' preSwitchover check $ void $ do
1078+ testWidget' static check $ void $ do
14601079 pb <- getPostBuild
14611080 replace <- triggerEventWithChan chan
14621081 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1500,7 +1119,7 @@ tests withDebugging wdConfig caps _selenium = do
15001119 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
15011120 liftIO $ dmap `H.shouldBe` intMap
15021121
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1122+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
15041123 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
15051124 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
15061125 elClass "span" "key" $ text $ textKey2 k
@@ -1551,12 +1170,12 @@ tests withDebugging wdConfig caps _selenium = do
15511170
15521171 describe "hydration" $ moveSpec $ \initMap test -> do
15531172 chan <- liftIO newChan
1554− let preSwitchover = getAndCheckInitialItems initMap
1173+ let static = getAndCheckInitialItems initMap
15551174 check xs = do
15561175 checkInitialItems initMap xs
15571176 body <- getBody
15581177 test body chan
1559− testWidget' preSwitchover check $ void $ do
1178+ testWidget' static check $ void $ do
15601179 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15611180 liftIO $ assertEqual "DMap" initMap dmap
15621181
@@ -1580,9 +1199,9 @@ tests withDebugging wdConfig caps _selenium = do
15801199 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15811200 liftIO $ assertEqual "DMap" initMap dmap
15821201
1583− session' "hydrating invalid HTML" $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1585− let preSwitchover = do
1202+ describe "hydrating invalid HTML" $ session' $ do
1203+ it "can hydrate list in paragraph" $ runWD $ do
1204+ let static = do
15861205 checkBodyText "before\ninner\nafter"
15871206 -- Two <p> tags should be present
15881207 (p1, p2) <- WD.findElems (WD.ByTag "p") >>= \case
@@ -1598,8 +1217,7 @@ tests withDebugging wdConfig caps _selenium = do
15981217 shouldContainText "before\ninner\nafter" p1
15991218 elementShouldBeRemoved ol
16001219 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1220+ testWidget' static check $ do
16031221 -- This is deliberately invalid HTML, the browser will interpret it as
16041222 -- <p>before</p><ol>inner</ol>after<p></p>
16051223 el "p" $ do
@@ -1607,29 +1225,6 @@ tests withDebugging wdConfig caps _selenium = do
16071225 el "ol" $ text "inner"
16081226 text "after"
16091227
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
1615− let doCheck = 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"
1632−
16331228data Selenium = Selenium
16341229 { _selenium_portNumber :: PortNumber
16351230 , _selenium_stopServer :: IO ()
@@ -1697,9 +1292,6 @@ checkTextInId i expected = do
16971292findElemWithRetry :: Selector -> WD WD.Element
16981293findElemWithRetry = withRetry . WD.findElem
16991294
1700−findElemsWithRetry :: Selector -> WD [WD.Element]
1701−findElemsWithRetry = withRetry . WD.findElems
1702−
17031295getBody :: WD WD.Element
17041296getBody = WD.findElem $ WD.ByTag "body"
17051297
@@ -1708,8 +1300,8 @@ withRetry a = wait 300
17081300 where wait :: Int -> WD a
17091301 wait 0 = a
17101302 wait n = try a >>= \case
1711− Left (e :: SomeException) -> do
1712− liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1303+ Left (_ :: SomeException) -> do
1304+ liftIO $ threadDelay 100000
17131305 wait $ n - 1
17141306 Right v -> return v
17151307
@@ -1725,12 +1317,11 @@ testWidgetStaticDebug
17251317 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17261318 -- ^ Widget we are testing
17271319 -> WD b
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1320+testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
17291321
17301322-- | TODO: do something about JSExceptions not causing tests to fail
17311323testWidgetDebug
17321324 :: Bool
1733− -> Bool
17341325 -> WD ()
17351326 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17361327 -> WD b
@@ -1738,16 +1329,12 @@ testWidgetDebug
17381329 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17391330 -- ^ Widget we are testing
17401331 -> 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
1332+testWidgetDebug withDebugging beforeJS afterSwitchover =
1333+ testWidgetDebug' withDebugging beforeJS (const afterSwitchover)
17461334
17471335-- | TODO: do something about JSExceptions not causing tests to fail
17481336testWidgetDebug'
17491337 :: Bool
1750− -> Bool
17511338 -> WD a
17521339 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17531340 -> (a -> WD b)
@@ -1755,7 +1342,7 @@ testWidgetDebug'
17551342 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17561343 -- ^ Widget we are testing (contents of body)
17571344 -> WD b
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1345+testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
17591346 let putStrLnDebug :: MonadIO m => Text -> m ()
17601347 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
17611348 staticApp = do
@@ -1767,7 +1354,6 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17671354 ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
17681355 putStrLnDebug "rendered static"
17691356 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
17711357 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
17721358 let entryPoint = do
17731359 putStrLnDebug "taking waitBeforeJS"
@@ -1779,7 +1365,7 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17791365 liftIO $ putMVar waitUntilSwitchover ()
17801366 putStrLnDebug "put waitUntilSwitchover"
17811367 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1368+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
17831369 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
17841370 syncPoint
17851371 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
@@ -1797,26 +1383,23 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17971383 ]
17981384 -- hSilence to get rid of ConnectionClosed logs
17991385 silenceIfDebug = if withDebugging then id else hSilence [stderr]
1800− jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1801− withAsync' jsaddleWarp $ do
1802− putStrLnDebug "taking waitJSaddle"
1803− liftIO $ takeMVar waitJSaddle
1804− putStrLnDebug "opening page"
1805− WD.openPage $ "http://localhost:" <> show jsaddlePort
1806− putStrLnDebug "running beforeJS"
1807− a <- beforeJS
1808− putStrLnDebug "putting waitBeforeJS"
1809− liftIO $ putMVar waitBeforeJS ()
1810− putStrLnDebug "taking waitUntilSwitchover"
1811− liftIO $ takeMVar waitUntilSwitchover
1812− putStrLnDebug "running afterSwitchover"
1813− afterSwitchover a
1814−
1815−withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
1816−withAsync' f g = bracket
1817− (liftIO $ Async.async f)
1818− (liftIO . Async.uninterruptibleCancel)
1819− (const g)
1386+ jsaddleWarp = forkIO $ silenceIfDebug $ Warp.runSettings settings application
1387+ jsaddleTid <- liftIO jsaddleWarp
1388+ putStrLnDebug "taking waitJSaddle"
1389+ liftIO $ takeMVar waitJSaddle
1390+ putStrLnDebug "opening page"
1391+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1392+ putStrLnDebug "running beforeJS"
1393+ a <- beforeJS
1394+ putStrLnDebug "putting waitBeforeJS"
1395+ liftIO $ putMVar waitBeforeJS ()
1396+ putStrLnDebug "taking waitUntilSwitchover"
1397+ liftIO $ takeMVar waitUntilSwitchover
1398+ putStrLnDebug "running afterSwitchover"
1399+ b <- afterSwitchover a
1400+ putStrLnDebug "killing jsaddle thread"
1401+ liftIO $ killThread jsaddleTid
1402+ return b
18201403
18211404data Key2 a where
18221405 Key2_Int :: Int -> Key2 Int