From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 12 Dec 2022 10:50:38 +0000 (+0100)
Subject: ; Skip two eglot tests when typescript is missing
X-Git-Tag: emacs-29.0.90~1223
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42d740fb2cb25eef26a5d2e3cab86fa38f909652;p=emacs.git

; 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.
---

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."
 
 (ert-deftest javascript-basic ()
   "Test basic autocompletion in a JavaScript LSP."
-  (skip-unless (executable-find "typescript-language-server"))
+  (skip-unless (and (executable-find "typescript-language-server")
+                    (executable-find "tsserver")))
   (eglot--with-fixture
       '(("project" . (("hello.js" . "console.log('Hello world!');"))))
     (with-current-buffer
@@ -752,7 +753,8 @@ pylsp prefers autopep over yafp, despite its README stating the contrary."
 
 (ert-deftest project-wide-diagnostics-typescript ()
   "Test diagnostics through multiple files in a TypeScript LSP."
-  (skip-unless (executable-find "typescript-language-server"))
+  (skip-unless (and (executable-find "typescript-language-server")
+                    (executable-find "tsserver")))
   (eglot--with-fixture
       '(("project" . (("hello.ts" . "const thing = 5;\nexport { thin }")
                       ("hello2.ts" . "import { thing } from './hello'"))))