X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=README.md;h=6f43add975965404cd57b982247ca72411ad7790;hp=ce452fe715d8858a995bf5a19230a394e8700492;hb=HEAD;hpb=6d352ac93d32f520a36c530bc42c86f05fd449b7

diff --git a/README.md b/README.md
index ce452fe..6f43add 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,14 @@
-# lsp-test [![Build Status](https://travis-ci.com/bubba/lsp-test.svg?branch=master)](https://travis-ci.com/bubba/lsp-test) [![Hackage](https://img.shields.io/hackage/v/lsp-test.svg)](https://hackage.haskell.org/package/lsp-test-0.1.0.0)
+# The lsp-test repo has been merged into haskell/lsp
+
+Please visit [haskell/lsp](https://github.com/haskell/lsp) instead (Don't worry though, it's still mantained and still lives under the same lsp-test package on hackage)
+
+
+# lsp-test [![Actions Status](https://github.com/bubba/lsp-test/workflows/Haskell%20CI/badge.svg)](https://github.com/bubba/lsp-test/actions) [![Hackage](https://img.shields.io/hackage/v/lsp-test.svg)](https://hackage.haskell.org/package/lsp-test)
 lsp-test is a functional testing framework for Language Server Protocol servers.
 
 ```haskell
-import Language.Haskell.LSP.Test
-runSession "hie" fullCaps "proj/dir" $ do
+import Language.LSP.Test
+main = runSession "hie" fullCaps "proj/dir" $ do
   doc <- openDoc "Foo.hs" "haskell"
   skipMany anyNotification
   symbols <- getDocumentSymbols doc
@@ -34,18 +39,20 @@ count 4 (message :: Session ApplyWorkspaceEditRequest)
 anyRequest <|> anyResponse
 ```
 
-Try out the example tests in the `example` directory with `cabal new-test`.
-For more examples check the [Wiki](https://github.com/bubba/lsp-test/wiki/Introduction)
+Try out the example tests in the `example` directory with `cabal test`.
+For more examples check the [Wiki](https://github.com/bubba/lsp-test/wiki/Introduction), or see this [introductory blog post](https://lukelau.me/haskell/posts/lsp-test/).
+
+Whilst writing your tests you may want to debug them to see what's going wrong.
+You can set the `logMessages` and `logStdErr` options in `SessionConfig` to see what the server is up to.
+There are also corresponding environment variables so you can turn them on from the command line:
+```
+LSP_TEST_LOG_MESSAGES=1 LSP_TEST_LOG_STDERR=1 cabal test
+```
 
 ## Developing
-The tests are integration tests, so make sure you have the following language servers installed and on your PATH:
-### [haskell-ide-engine](https://github.com/haskell/haskell-ide-engine)
-- Check out a relatively recent version of the repo, or see `.travis.yml` to get the exact commit used for CI.
-- `stack install`
-### [javascript-typescript-langserver](https://github.com/sourcegraph/javascript-typescript-langserver)
-`npm i -g javascript-typescript-langserver`
-
-Then run the tests with `stack test` or `cabal new-test`.
+The tests for lsp-test use a dummy server found in `test/dummy-server/`.
+Run the tests with `cabal test` or `stack test`.
+Tip: If you want to filter the tests, use `cabal run test:tests -- -m "foo"`
 
 ## Troubleshooting
 Seeing funny stuff when running lsp-test via stack? If your server is built upon Haskell tooling, [keep in mind that stack sets some environment variables related to GHC, and you may want to unset them.](https://github.com/alanz/haskell-ide-engine/blob/bfb16324d396da71000ef81d51acbebbdaa854ab/test/utils/TestUtils.hs#L290-L298)