aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorStefan Kangas2022-12-12 11:50:38 +0100
committerStefan Kangas2022-12-12 17:54:18 +0100
commit42d740fb2cb25eef26a5d2e3cab86fa38f909652 (patch)
tree69697d9f6b292e35e5d5ee5dc1dd38b7404cda85 /test
parent19ef86f775a39eab46231c3eb6fc702e06857a5a (diff)
downloademacs-42d740fb2cb25eef26a5d2e3cab86fa38f909652.tar.gz
emacs-42d740fb2cb25eef26a5d2e3cab86fa38f909652.zip
; Skip two eglot tests when typescript is missing
* test/lisp/progmodes/eglot-tests.el (javascript-basic, project-wide-diagnostics-typescript): Skip tests when the npm package "typescript" is not installed.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/progmodes/eglot-tests.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el
index fd0a68973ea..32eefd778fe 100644
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@ -723,7 +723,8 @@ pylsp prefers autopep over yafp, despite its README stating the contrary."
723 723
724(ert-deftest javascript-basic () 724(ert-deftest javascript-basic ()
725 "Test basic autocompletion in a JavaScript LSP." 725 "Test basic autocompletion in a JavaScript LSP."
726 (skip-unless (executable-find "typescript-language-server")) 726 (skip-unless (and (executable-find "typescript-language-server")
727 (executable-find "tsserver")))
727 (eglot--with-fixture 728 (eglot--with-fixture
728 '(("project" . (("hello.js" . "console.log('Hello world!');")))) 729 '(("project" . (("hello.js" . "console.log('Hello world!');"))))
729 (with-current-buffer 730 (with-current-buffer
@@ -752,7 +753,8 @@ pylsp prefers autopep over yafp, despite its README stating the contrary."
752 753
753(ert-deftest project-wide-diagnostics-typescript () 754(ert-deftest project-wide-diagnostics-typescript ()
754 "Test diagnostics through multiple files in a TypeScript LSP." 755 "Test diagnostics through multiple files in a TypeScript LSP."
755 (skip-unless (executable-find "typescript-language-server")) 756 (skip-unless (and (executable-find "typescript-language-server")
757 (executable-find "tsserver")))
756 (eglot--with-fixture 758 (eglot--with-fixture
757 '(("project" . (("hello.ts" . "const thing = 5;\nexport { thin }") 759 '(("project" . (("hello.ts" . "const thing = 5;\nexport { thin }")
758 ("hello2.ts" . "import { thing } from './hello'")))) 760 ("hello2.ts" . "import { thing } from './hello'"))))