@@ -1,9 +1,12 @@
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 #-}
4−{-# LANGUAGE FlexibleInstances #-}
59{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
710{-# LANGUAGE LambdaCase #-}
811{-# LANGUAGE MultiParamTypeClasses #-}
912{-# LANGUAGE OverloadedStrings #-}
@@ -11,43 +14,27 @@
1114{-# LANGUAGE RankNTypes #-}
1215{-# LANGUAGE RecursiveDo #-}
1316{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
1517{-# LANGUAGE TemplateHaskell #-}
1618{-# LANGUAGE TupleSections #-}
1719{-# LANGUAGE TypeApplications #-}
1820{-# LANGUAGE TypeFamilies #-}
19−{-# LANGUAGE UndecidableInstances #-}
2021
21−{-# OPTIONS_GHC -fno-warn-orphans #-}
22−
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)
3222import Control.Concurrent
33−import qualified Control.Concurrent.Async as Async
34−import Control.Lens.Operators
35−import Control.Monad hiding (fail)
23+import Control.Monad
3624import Control.Monad.Catch
37−import Control.Monad.Fail
3825import Control.Monad.Fix
3926import Control.Monad.IO.Class
4027import Control.Monad.Ref
4128import Data.Constraint.Extras
4229import Data.Constraint.Extras.TH
4330import Data.Dependent.Map (DMap)
44−import Data.Dependent.Sum (DSum(..), (==>))
31+import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
32+--import Data.Foldable (traverse_)
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
@@ -66,14 +52,12 @@ import System.IO (stderr)
6652import System.IO.Silently
6753import System.IO.Temp
6854import System.Process
69−import System.Which (staticWhich)
70−import qualified Test.HUnit as HUnit
55+import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
7156import qualified Test.Hspec as H
72−import qualified Test.Hspec.Core.Spec as H
7357import Test.Hspec (xit)
74−import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
58+import Test.Hspec.WebDriver hiding (runWD, click, uploadFile)
7559import qualified Test.Hspec.WebDriver as WD
76−import Test.WebDriver (WD(..))
60+import Test.WebDriver (WD)
7761
7862import qualified Data.ByteString.Lazy as LBS
7963import qualified Data.Dependent.Map as DMap
@@ -89,32 +73,19 @@ import qualified Test.WebDriver.Capabilities as WD
8973import Test.Util.ChromeFlags
9074import Test.Util.UnshareNetwork
9175
92−-- ORPHAN: https://github.com/kallisti-dev/hs-webdriver/pull/167
93−deriving instance MonadMask WD
94−
95−chromium :: FilePath
96−chromium = $(staticWhich "chromium")
97−
9876seleniumPort, jsaddlePort :: PortNumber
9977seleniumPort = 8000
10078jsaddlePort = 8001
10179
10280-- TODO Remove orphan
103−instance MonadRef WD where
104− type Ref WD = Ref IO
105− newRef = WD . newRef
106− readRef = WD . readRef
107− writeRef r = WD . writeRef r
81+deriving instance MonadRef WD
10882
10983assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110−assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
84+assertEqual a b = liftIO . HUnit.assertEqual a b
11185
11286assertFailure :: MonadIO m => String -> m ()
11387assertFailure = liftIO . HUnit.assertFailure
11488
115−assertBool :: (MonadIO m) => String -> Bool -> m ()
116−assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117−
11889chromeConfig :: Text -> [Text] -> WD.WDConfig
11990chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
12091
@@ -141,26 +112,35 @@ deriveGEq ''DKey
141112deriveGCompare ''DKey
142113deriveGShow ''DKey
143114
144−deriving instance MonadFail WD
115+instance ShowTag DKey Identity where
116+ showTaggedPrec = \case
117+ Key_Int -> showsPrec
118+ Key_Char -> showsPrec
119+ Key_Bool -> showsPrec
120+
121+instance EqTag DKey Identity where
122+ eqTagged Key_Int Key_Int = (==)
123+ eqTagged Key_Char Key_Char = (==)
124+ eqTagged Key_Bool Key_Bool = (==)
145125
146126main :: IO ()
147127main = do
148− unshareNetwork
128+ unshareNetork
149129 isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
150130 withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
151131 withSeleniumServer $ \selenium -> do
152− let browserPath = T.strip $ T.pack chromium
132+ browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
153133 when (T.null browserPath) $ fail "No browser found"
154− withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
134+ withDebugging <- isJust <$> lookupEnv "DEBUG"
155135 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156136 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
137+ hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
158138
159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
139+tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec
160140tests withDebugging wdConfig caps _selenium = do
161141 let putStrLnDebug :: MonadIO m => Text -> m ()
162142 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163− session' t = sessionWith wdConfig t . using caps
143+ session' = sessionWith wdConfig "" . using (map (,"") caps)
164144 runWD m = runWDOptions (WdOptions False) $ do
165145 putStrLnDebug "before"
166146 r <- m
@@ -169,10 +149,10 @@ tests withDebugging wdConfig caps _selenium = do
169149 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170150 testWidgetStatic = testWidgetStaticDebug withDebugging
171151 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172− testWidget = testWidgetDebug True withDebugging
152+ testWidget = testWidgetDebug withDebugging
173153 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
154+ testWidget' = testWidgetDebug' withDebugging
155+ describe "text" $ session' $ do
176156 it "works" $ runWD $ do
177157 testWidgetStatic (checkBodyText "hello world") $ do
178158 text "hello world"
@@ -233,7 +213,7 @@ tests withDebugging wdConfig caps _selenium = do
233213 click <- button ""
234214 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
235215
236− session' "element" $ do
216+ describe "element" $ session' $ do
237217 it "works with domEvent Click" $ runWD $ do
238218 clickedRef <- liftIO $ newRef False
239219 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
@@ -296,86 +276,36 @@ tests withDebugging wdConfig caps _selenium = do
296276 (e, ()) <- element "div" conf $ text "hello world"
297277 let click = domEvent Click e
298278 return ()
279+ -- TODO check this is the correct solution
280+ it "has ssr attribute, removes ssr attribute" $ runWD $ do
281+ let checkSSRAttr = do
282+ e <- findElemWithRetry $ WD.ByTag "div"
283+ assertAttr e "data-ssr" (Just "")
284+ pure e
285+ testWidget' checkSSRAttr (\e -> assertAttr e "data-ssr" Nothing) $ el "div" $ text "hello world"
299286
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
287+ describe "inputElement" $ do
288+ describe "hydration" $ session' $ do
359289 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
290+ inputRef <- newRef ("" :: Text)
361291 testWidget'
362292 (do
363293 e <- findElemWithRetry $ WD.ByTag "input"
364− WD.sendKeys "world" e
294+ WD.sendKeys "hello world" e
365295 pure e)
366296 (\e -> do
367297 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368− WD.click =<< findElemWithRetry (WD.ByTag "button")
298+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
369299 readRef inputRef `shouldBeWithRetryM` "hello world"
370300 ) $ do
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
301+ e <- inputElement def
372302 click <- button "save"
373303 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374304 it "captures user input after switchover" $ runWD $ do
375305 inputRef <- newRef ("" :: Text)
376306 let checkValue = do
377− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
378− WD.click =<< findElemWithRetry (WD.ByTag "button")
307+ WD.sendKeys "hello world" =<< (findElemWithRetry $ WD.ByTag "input")
308+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
379309 readRef inputRef `shouldBeWithRetryM` "hello world"
380310 testWidget (pure ()) checkValue $ do
381311 e <- inputElement def
@@ -425,56 +355,31 @@ tests withDebugging wdConfig caps _selenium = do
425355 checkedByUIRef <- newRef False
426356 checkedRef <- newRef False
427357 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
358+ let checkValue = do
433359 readRef checkedByUIRef `shouldBeWithRetryM` False
434360 readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
361+ e <- findElemWithRetry $ WD.ByTag "input"
436362 WD.moveToCenter e
437363 WD.click e
438364 readRef checkedByUIRef `shouldBeWithRetryM` True
439365 readRef checkedRef `shouldBeWithRetryM` True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441366 liftIO $ writeChan setCheckedChan False
442367 readRef checkedByUIRef `shouldBeWithRetryM` True
443368 readRef checkedRef `shouldBeWithRetryM` False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
369+ testWidget (pure ()) checkValue $ do
446370 setChecked <- triggerEventWithChan setCheckedChan
447371 e <- inputElement $ def
448372 & initialAttributes .~ "type" =: "checkbox"
449373 & inputElementConfig_setChecked .~ setChecked
450374 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451375 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)
471376 it "captures file uploads" $ runWD $ do
472377 filesRef :: IORef [Text] <- newRef []
473378 let uploadFile = do
474379 e <- findElemWithRetry $ WD.ByTag "input"
475380 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
476381 WD.sendKeys (T.pack path) e
477− WD.click =<< findElemWithRetry (WD.ByTag "button")
382+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
478383 liftIO $ removeFile path
479384 readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
480385 testWidget (pure ()) uploadFile $ do
@@ -483,122 +388,13 @@ tests withDebugging wdConfig caps _selenium = do
483388 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484389 names <- liftJSM $ traverse File.getName fs
485390 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
391+
392+ describe "hydration/immediate" $ session' $ do
597393 it "captures user input after switchover" $ runWD $ do
598394 inputRef :: IORef Text <- newRef ""
599395 let checkValue = do
600− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
601− WD.click =<< findElemWithRetry (WD.ByTag "button")
396+ WD.sendKeys "hello world" =<< (findElemWithRetry $ WD.ByTag "input")
397+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
602398 readRef inputRef `shouldBeWithRetryM` "hello world"
603399 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
604400 e <- inputElement def
@@ -615,6 +411,7 @@ tests withDebugging wdConfig caps _selenium = do
615411 e <- inputElement def
616412 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
617413 it "sets value appropriately" $ runWD $ do
414+ putStrLnDebug "sets value appropriately"
618415 valueByUIRef :: IORef Text <- newRef ""
619416 valueRef :: IORef Text <- newRef ""
620417 setValueChan :: Chan Text <- liftIO newChan
@@ -635,69 +432,77 @@ tests withDebugging wdConfig caps _selenium = do
635432 performEvent_ $ liftIO . writeRef valueByUIRef <$> _inputElement_input e
636433 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
637434 it "sets checked appropriately" $ runWD $ do
435+ putStrLnDebug "sets checked appropriately"
638436 checkedByUIRef <- newRef False
639437 checkedRef <- newRef False
640438 setCheckedChan <- liftIO newChan
641439 let checkValue = do
440+ putStrLnDebug "1"
642441 readRef checkedByUIRef `shouldBeWithRetryM` False
442+ putStrLnDebug "2"
643443 readRef checkedRef `shouldBeWithRetryM` False
444+ putStrLnDebug "3"
644445 e <- findElemWithRetry $ WD.ByTag "input"
446+ putStrLnDebug "4"
645447 WD.moveToCenter e
448+ putStrLnDebug "5"
646449 WD.click e
450+ putStrLnDebug "6"
647451 readRef checkedByUIRef `shouldBeWithRetryM` True
452+ putStrLnDebug "7"
648453 readRef checkedRef `shouldBeWithRetryM` True
454+ putStrLnDebug "8"
649455 liftIO $ writeChan setCheckedChan False
456+ putStrLnDebug "9"
650457 readRef checkedByUIRef `shouldBeWithRetryM` True
458+ putStrLnDebug "10"
651459 readRef checkedRef `shouldBeWithRetryM` False
460+ putStrLnDebug "11"
652461 testWidget (pure ()) checkValue $ do
462+ putStrLnDebug "12"
653463 setChecked <- triggerEventWithChan setCheckedChan
464+ putStrLnDebug "13"
654465 prerender_ (pure ()) $ do
466+ putStrLnDebug "14"
655467 e <- inputElement $ def
656468 & initialAttributes .~ "type" =: "checkbox"
657469 & inputElementConfig_setChecked .~ setChecked
470+ putStrLnDebug "15"
658471 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
472+ putStrLnDebug "16"
659473 performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
474+ putStrLnDebug "17"
660475 it "captures file uploads" $ runWD $ do
661476 filesRef :: IORef [Text] <- newRef []
662477 let uploadFile = do
478+ putStrLnDebug "1"
663479 e <- findElemWithRetry $ WD.ByTag "input"
480+ putStrLnDebug "2"
664481 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
482+ putStrLnDebug "3"
665483 WD.sendKeys (T.pack path) e
666− WD.click =<< findElemWithRetry (WD.ByTag "button")
484+ putStrLnDebug "4"
485+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
486+ putStrLnDebug "5"
667487 liftIO $ removeFile path
488+ putStrLnDebug "6"
668489 readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
490+ putStrLnDebug "7"
669491 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
492+ putStrLnDebug "8"
670493 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
494+ putStrLnDebug "9"
671495 click <- button "save"
496+ putStrLnDebug "10"
672497 performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
498+ putStrLnDebug "11"
673499 names <- liftJSM $ traverse File.getName fs
500+ putStrLnDebug "12"
674501 liftIO $ writeRef filesRef names
502+ putStrLnDebug "13"
675503
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
504+ describe "textAreaElement" $ do
505+ describe "hydration" $ session' $ do
701506 it "doesn't wipe user input when switching over" $ runWD $ do
702507 inputRef <- newRef ("" :: Text)
703508 testWidget'
@@ -716,8 +521,8 @@ tests withDebugging wdConfig caps _selenium = do
716521 it "captures user input after switchover" $ runWD $ do
717522 inputRef <- newRef ("" :: Text)
718523 let checkValue = do
719− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "textarea")
720− WD.click =<< findElemWithRetry (WD.ByTag "button")
524+ WD.sendKeys "hello world" =<< (findElemWithRetry $ WD.ByTag "textarea")
525+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
721526 readRef inputRef `shouldBeWithRetryM` "hello world"
722527 testWidget (pure ()) checkValue $ do
723528 e <- textAreaElement def
@@ -763,90 +568,8 @@ tests withDebugging wdConfig caps _selenium = do
763568 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764569 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765570 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
848571
849− describe "hydration/immediate" $ do
572+ describe "hydration/immediate" $ session' $ do
850573 it "captures user input after switchover" $ runWD $ do
851574 inputRef :: IORef Text <- newRef ""
852575 let checkValue = do
@@ -888,24 +611,24 @@ tests withDebugging wdConfig caps _selenium = do
888611 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889612 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890613
891− session' "selectElement" $ do
614+ describe "selectElement" $ do
892615 let options :: DomBuilder t m => m ()
893616 options = do
894617 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895618 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896619 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
620+ describe "hydration" $ session' $ do
898621 it "sets initial value correctly" $ runWD $ do
899622 inputRef <- newRef ("" :: Text)
900623 let setup = do
901624 e <- findElemWithRetry $ WD.ByTag "select"
902625 assertAttr e "value" (Just "three")
903− WD.click =<< findElemWithRetry (WD.ById "two")
626+ WD.click =<< (findElemWithRetry $ WD.ById "two")
904627 pure e
905628 check e = do
906629 assertAttr e "value" (Just "two")
907630 readRef inputRef `shouldBeWithRetryM` "three"
908− WD.click =<< findElemWithRetry (WD.ByTag "button")
631+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
909632 assertAttr e "value" (Just "two")
910633 readRef inputRef `shouldBeWithRetryM` "two"
911634 testWidget' setup check $ do
@@ -918,9 +641,9 @@ tests withDebugging wdConfig caps _selenium = do
918641 let checkValue = do
919642 e <- findElemWithRetry $ WD.ByTag "select"
920643 assertAttr e "value" (Just "one")
921− WD.click =<< findElemWithRetry (WD.ById "two")
644+ WD.click =<< (findElemWithRetry $ WD.ById "two")
922645 assertAttr e "value" (Just "two")
923− WD.click =<< findElemWithRetry (WD.ByTag "button")
646+ WD.click =<< (findElemWithRetry $ WD.ByTag "button")
924647 readRef inputRef `shouldBeWithRetryM` "two"
925648 testWidget (pure ()) checkValue $ do
926649 (e, ()) <- selectElement def options
@@ -968,7 +691,7 @@ tests withDebugging wdConfig caps _selenium = do
968691 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969692 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970693
971− describe "hydration/immediate" $ do
694+ describe "hydration/immediate" $ session' $ do
972695 it "captures user input after switchover" $ runWD $ do
973696 inputRef :: IORef Text <- newRef ""
974697 let checkValue = do
@@ -1014,7 +737,7 @@ tests withDebugging wdConfig caps _selenium = do
1014737 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015738 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016739
1017− session' "prerender" $ do
740+ describe "prerender" $ session' $ do
1018741 it "works in simple case" $ runWD $ do
1019742 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020743 prerender_ (text "One") (text "Two")
@@ -1059,9 +782,9 @@ tests withDebugging wdConfig caps _selenium = do
1059782 pb <- getPostBuild
1060783 performEvent_ $ liftIO (putMVar lock ()) <$ pb
1061784 it "result Dynamic is updated *after* switchover" $ runWD $ do
1062− let preSwitchover = checkBodyText "PostBuild"
785+ let static = checkBodyText "PostBuild"
1063786 check = checkBodyText "Client"
1064− testWidget preSwitchover check $ void $ do
787+ testWidget static check $ void $ do
1065788 d <- prerender (pure "Initial") (pure "Client")
1066789 pb <- getPostBuild
1067790 initial <- sample $ current d
@@ -1069,30 +792,21 @@ tests withDebugging wdConfig caps _selenium = do
1069792 -- This essentially checks that the client IO runs *after* switchover/postBuild,
1070793 -- thus can't create conflicting DOM
1071794 it "can't exploit IO to break hydration" $ runWD $ do
1072− let preSwitchover = checkBodyText "Initial"
1073− testWidgetStatic preSwitchover $ void $ do
795+ let static = checkBodyText "Initial"
796+ testWidgetStatic static $ void $ do
1074797 ref <- liftIO $ newRef "Initial"
1075798 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1076799 text <=< liftIO $ readRef ref
1077800 -- As above, so below
1078801 it "can't exploit triggerEvent to break hydration" $ runWD $ do
1079− let preSwitchover = checkBodyText "Initial"
802+ let static = checkBodyText "Initial"
1080803 check = checkBodyText "Client"
1081− testWidget preSwitchover check $ void $ do
804+ testWidget static check $ void $ do
1082805 (e, trigger) <- newTriggerEvent
1083806 prerender_ (pure ()) (liftIO $ trigger "Client")
1084807 textNode $ TextNodeConfig "Initial" $ Just e
1085808
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
809+ describe "runWithReplace" $ session' $ do
1096810 it "works" $ runWD $ do
1097811 replaceChan :: Chan Text <- liftIO newChan
1098812 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -1126,7 +840,7 @@ tests withDebugging wdConfig caps _selenium = do
1126840 , el "span" . text <$> replace
1127841 ]
1128842 it "can be nested in postBuild widget" $ runWD $ do
1129− replaceChan :: Chan Text <- liftIO newChan
843+ replaceChan <- liftIO newChan
1130844 let setup = findElemWithRetry $ WD.ByTag "div"
1131845 check ssr = do
1132846 -- Check that the original element still exists and has the correct text
@@ -1159,7 +873,7 @@ tests withDebugging wdConfig caps _selenium = do
1159873 replaceChan2 :: Chan Text <- liftIO newChan
1160874 lock :: MVar () <- liftIO newEmptyMVar
1161875 let check = do
1162− shouldContainText "" =<< findElemWithRetry (WD.ByTag "body")
876+ shouldContainText "" =<< (findElemWithRetry (WD.ByTag "body"))
1163877 liftIO $ do
1164878 writeChan replaceChan1 "one"
1165879 takeMVar lock
@@ -1236,61 +950,7 @@ tests withDebugging wdConfig caps _selenium = do
1236950 , el "span" . text <$> replace
1237951 ]
1238952
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
953+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294954 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295955 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296956 elClass "span" "key" $ text $ textKey k
@@ -1299,8 +959,8 @@ tests withDebugging wdConfig caps _selenium = do
1299959 checkItem :: WD.Element -> Text -> Text -> WD ()
1300960 checkItem li k v = do
1301961 putStrLnDebug "checkItem"
1302− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1303− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
962+ shouldContainTextNoRetry k =<< (WD.findElemFrom li (WD.ByClass "key"))
963+ shouldContainTextNoRetry v =<< (WD.findElemFrom li (WD.ByClass "value"))
1304964 checkInitialItems dm xs = do
1305965 putStrLnDebug "checkInitialItems"
1306966 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
@@ -1330,26 +990,26 @@ tests withDebugging wdConfig caps _selenium = do
1330990 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1331991 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1332992 chan <- liftIO newChan
1333− let preSwitchover :: WD [WD.Element]
1334− preSwitchover = getAndCheckInitialItems keyMap
993+ let static :: WD [WD.Element]
994+ static = getAndCheckInitialItems keyMap
1335995 check :: [WD.Element] -> WD ()
1336996 check xs = do
1337997 checkInitialItems keyMap xs
1338998 checkRemoval chan Key_Int
1339999 checkReplace chan Key_Char 'B'
13401000 checkInsert chan Key_Bool True
1341− testWidget' preSwitchover check $ do
1001+ testWidget' static check $ do
13421002 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
13431003 liftIO $ dmap `H.shouldBe` keyMap
13441004 it "handles postBuild correctly" $ runWD $ do
13451005 chan <- liftIO newChan
1346− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1006+ let static = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
13471007 check xs = do
13481008 withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
13491009 checkRemoval chan Key_Int
13501010 checkInsert chan Key_Char 'B'
13511011 checkReplace chan Key_Bool True
1352− testWidget' preSwitchover check $ void $ do
1012+ testWidget' static check $ void $ do
13531013 pb <- getPostBuild
13541014 replace <- triggerEventWithChan chan
13551015 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1393,7 +1053,7 @@ tests withDebugging wdConfig caps _selenium = do
13931053 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
13941054 liftIO $ dmap `H.shouldBe` keyMap
13951055
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1056+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
13971057 let textKeyInt k = "key" <> T.pack (show k)
13981058 intMap = IntMap.fromList
13991059 [ (1, "one")
@@ -1439,24 +1099,24 @@ tests withDebugging wdConfig caps _selenium = do
14391099 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
14401100 xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
14411101 chan <- liftIO newChan
1442− let preSwitchover = getAndCheckInitialItems intMap
1102+ let static = getAndCheckInitialItems intMap
14431103 check xs = do
14441104 checkInitialItems intMap xs
14451105 checkRemoval chan 1
14461106 checkReplace chan 2 "deux"
14471107 checkInsert chan 4 "four"
1448− testWidget' preSwitchover check $ void $ do
1108+ testWidget' static check $ void $ do
14491109 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
14501110 liftIO $ im `H.shouldBe` intMap
14511111 xit "handles postBuild correctly" $ runWD $ do
14521112 chan <- liftIO newChan
1453− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1113+ let static = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
14541114 check xs = do
14551115 withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
14561116 checkRemoval chan 1
14571117 checkInsert chan 2 "deux"
14581118 checkReplace chan 3 "trois"
1459− testWidget' preSwitchover check $ void $ do
1119+ testWidget' static check $ void $ do
14601120 pb <- getPostBuild
14611121 replace <- triggerEventWithChan chan
14621122 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1500,7 +1160,7 @@ tests withDebugging wdConfig caps _selenium = do
15001160 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
15011161 liftIO $ dmap `H.shouldBe` intMap
15021162
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1163+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
15041164 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
15051165 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
15061166 elClass "span" "key" $ text $ textKey2 k
@@ -1512,8 +1172,8 @@ tests withDebugging wdConfig caps _selenium = do
15121172 Key2_Char c -> "c" <> T.pack [c]
15131173 checkItem :: WD.Element -> Text -> Text -> WD ()
15141174 checkItem li k v = do
1515− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1516− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1175+ shouldContainTextNoRetry k =<< (WD.findElemFrom li (WD.ByClass "key"))
1176+ shouldContainTextNoRetry v =<< (WD.findElemFrom li (WD.ByClass "value"))
15171177 checkInitialItems dm xs = do
15181178 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
15191179 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey2 k) (T.pack $ has @Show k $ show v)
@@ -1521,9 +1181,6 @@ tests withDebugging wdConfig caps _selenium = do
15211181 xs <- WD.findElems (WD.ByTag "li")
15221182 checkInitialItems dm xs
15231183 pure xs
1524− moveSpec
1525− :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1526− -> H.SpecM (WdTestSession ()) ()
15271184 moveSpec testMove = do
15281185 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
15291186 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
@@ -1551,19 +1208,19 @@ tests withDebugging wdConfig caps _selenium = do
15511208
15521209 describe "hydration" $ moveSpec $ \initMap test -> do
15531210 chan <- liftIO newChan
1554− let preSwitchover = getAndCheckInitialItems initMap
1211+ let static = getAndCheckInitialItems initMap
15551212 check xs = do
15561213 checkInitialItems initMap xs
15571214 body <- getBody
15581215 test body chan
1559− testWidget' preSwitchover check $ void $ do
1216+ testWidget' static check $ void $ do
15601217 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15611218 liftIO $ assertEqual "DMap" initMap dmap
15621219
15631220 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
15641221 chan <- liftIO newChan
15651222 replace <- liftIO newChan
1566− lock :: MVar () <- liftIO newEmptyMVar
1223+ lock <- liftIO newEmptyMVar
15671224 let check = do
15681225 liftIO $ do
15691226 writeChan replace ()
@@ -1580,14 +1237,12 @@ tests withDebugging wdConfig caps _selenium = do
15801237 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15811238 liftIO $ assertEqual "DMap" initMap dmap
15821239
1583− session' "hydrating invalid HTML" $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1585− let preSwitchover = do
1240+ describe "hydrating invalid HTML" $ session' $ do
1241+ it "can hydrate list in paragraph" $ runWD $ do
1242+ let static = do
15861243 checkBodyText "before\ninner\nafter"
15871244 -- Two <p> tags should be present
1588− (p1, p2) <- WD.findElems (WD.ByTag "p") >>= \case
1589− [p1, p2] -> pure (p1, p2)
1590− _ -> error "Unexpected number of `p` tags (expected 2)"
1245+ [p1, p2] <- WD.findElems (WD.ByTag "p")
15911246 ol <- findElemWithRetry (WD.ByTag "ol")
15921247 shouldContainText "before" p1
15931248 shouldContainText "inner" ol
@@ -1598,8 +1253,7 @@ tests withDebugging wdConfig caps _selenium = do
15981253 shouldContainText "before\ninner\nafter" p1
15991254 elementShouldBeRemoved ol
16001255 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1256+ testWidget' static check $ do
16031257 -- This is deliberately invalid HTML, the browser will interpret it as
16041258 -- <p>before</p><ol>inner</ol>after<p></p>
16051259 el "p" $ do
@@ -1607,29 +1261,6 @@ tests withDebugging wdConfig caps _selenium = do
16071261 el "ol" $ text "inner"
16081262 text "after"
16091263
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−
16331264data Selenium = Selenium
16341265 { _selenium_portNumber :: PortNumber
16351266 , _selenium_stopServer :: IO ()
@@ -1697,9 +1328,6 @@ checkTextInId i expected = do
16971328findElemWithRetry :: Selector -> WD WD.Element
16981329findElemWithRetry = withRetry . WD.findElem
16991330
1700−findElemsWithRetry :: Selector -> WD [WD.Element]
1701−findElemsWithRetry = withRetry . WD.findElems
1702−
17031331getBody :: WD WD.Element
17041332getBody = WD.findElem $ WD.ByTag "body"
17051333
@@ -1708,8 +1336,8 @@ withRetry a = wait 300
17081336 where wait :: Int -> WD a
17091337 wait 0 = a
17101338 wait n = try a >>= \case
1711− Left (e :: SomeException) -> do
1712− liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1339+ Left (_ :: SomeException) -> do
1340+ liftIO $ threadDelay 100000
17131341 wait $ n - 1
17141342 Right v -> return v
17151343
@@ -1725,12 +1353,11 @@ testWidgetStaticDebug
17251353 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17261354 -- ^ Widget we are testing
17271355 -> WD b
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1356+testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
17291357
17301358-- | TODO: do something about JSExceptions not causing tests to fail
17311359testWidgetDebug
17321360 :: Bool
1733− -> Bool
17341361 -> WD ()
17351362 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17361363 -> WD b
@@ -1738,16 +1365,12 @@ testWidgetDebug
17381365 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17391366 -- ^ Widget we are testing
17401367 -> 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
1368+testWidgetDebug withDebugging beforeJS afterSwitchover =
1369+ testWidgetDebug' withDebugging beforeJS (const afterSwitchover)
17461370
17471371-- | TODO: do something about JSExceptions not causing tests to fail
17481372testWidgetDebug'
17491373 :: Bool
1750− -> Bool
17511374 -> WD a
17521375 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17531376 -> (a -> WD b)
@@ -1755,7 +1378,7 @@ testWidgetDebug'
17551378 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17561379 -- ^ Widget we are testing (contents of body)
17571380 -> WD b
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1381+testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
17591382 let putStrLnDebug :: MonadIO m => Text -> m ()
17601383 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
17611384 staticApp = do
@@ -1764,10 +1387,9 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17641387 bodyWidget
17651388 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
17661389 putStrLnDebug "rendering static"
1767− ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1390+ ((), html) <- liftIO $ renderStatic staticApp
17681391 putStrLnDebug "rendered static"
17691392 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
17711393 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
17721394 let entryPoint = do
17731395 putStrLnDebug "taking waitBeforeJS"
@@ -1779,7 +1401,7 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17791401 liftIO $ putMVar waitUntilSwitchover ()
17801402 putStrLnDebug "put waitUntilSwitchover"
17811403 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1404+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
17831405 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
17841406 syncPoint
17851407 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
@@ -1797,26 +1419,23 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17971419 ]
17981420 -- hSilence to get rid of ConnectionClosed logs
17991421 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)
1422+ jsaddleWarp = forkIO $ silenceIfDebug $ Warp.runSettings settings application
1423+ jsaddleTid <- liftIO jsaddleWarp
1424+ putStrLnDebug "taking waitJSaddle"
1425+ liftIO $ takeMVar waitJSaddle
1426+ putStrLnDebug "opening page"
1427+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1428+ putStrLnDebug "running beforeJS"
1429+ a <- beforeJS
1430+ putStrLnDebug "putting waitBeforeJS"
1431+ liftIO $ putMVar waitBeforeJS ()
1432+ putStrLnDebug "taking waitUntilSwitchover"
1433+ liftIO $ takeMVar waitUntilSwitchover
1434+ putStrLnDebug "running afterSwitchover"
1435+ b <- afterSwitchover a
1436+ putStrLnDebug "killing jsaddle thread"
1437+ liftIO $ killThread jsaddleTid
1438+ return b
18201439
18211440data Key2 a where
18221441 Key2_Int :: Int -> Key2 Int
@@ -1826,3 +1445,12 @@ deriveGEq ''Key2
18261445deriveGCompare ''Key2
18271446deriveGShow ''Key2
18281447deriveArgDict ''Key2
1448+
1449+instance ShowTag Key2 Identity where
1450+ showTaggedPrec = \case
1451+ Key2_Int _ -> showsPrec
1452+ Key2_Char _ -> showsPrec
1453+
1454+instance EqTag Key2 Identity where
1455+ eqTagged (Key2_Int _) (Key2_Int _) = (==)
1456+ eqTagged (Key2_Char _) (Key2_Char _) = (==)