From ddb4576e3524b64b6e1b6c8d821edc22cec31fb6 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Fri, 20 Dec 2019 21:26:50 +0000 Subject: [PATCH 1/2] Relax liquid version in test a bit --- test/unit/LiquidSpec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/LiquidSpec.hs b/test/unit/LiquidSpec.hs index 16191fb6a..99118fced 100644 --- a/test/unit/LiquidSpec.hs +++ b/test/unit/LiquidSpec.hs @@ -33,7 +33,7 @@ spec = do Nothing -> expectationFailure "liquid haskell exe is NOT in $PATH" Just exe -> do version <- readProcess exe ["--numeric-version"] "" - version `shouldSatisfy` isPrefixOf "0.8.6.2" + version `shouldSatisfy` ("0.8.6" `isPrefixOf`) -- --------------------------------- From eefa285dc9c9d1443626f7b49f2639537e777a40 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Fri, 20 Dec 2019 21:27:50 +0000 Subject: [PATCH 2/2] Reenable noDiagnostic checks --- test/functional/FunctionalCodeActionsSpec.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/FunctionalCodeActionsSpec.hs b/test/functional/FunctionalCodeActionsSpec.hs index acca7de77..251141d28 100644 --- a/test/functional/FunctionalCodeActionsSpec.hs +++ b/test/functional/FunctionalCodeActionsSpec.hs @@ -48,7 +48,7 @@ spec = describe "code actions" $ do contents <- getDocumentEdit doc liftIO $ contents `shouldBe` "main = undefined\nfoo x = x\n" - -- noDiagnostics + noDiagnostics -- --------------------------------- @@ -67,7 +67,7 @@ spec = describe "code actions" $ do contents <- skipManyTill publishDiagnosticsNotification $ getDocumentEdit doc liftIO $ contents `shouldBe` "main = undefined\nfoo x = x\n" - -- noDiagnostics + noDiagnostics -- --------------------------------- @@ -96,7 +96,7 @@ spec = describe "code actions" $ do liftIO $ contents `shouldBe` "main = undefined\nfoo x = x\n" sendNotification TextDocumentDidSave (DidSaveTextDocumentParams doc) - -- noDiagnostics + noDiagnostics -- -----------------------------------