Merge branch 'main' into windows_support

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 nvim-neotest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -14,7 +14,7 @@ use({
   'nvim-neotest/neotest',
   requires = {
     ...,
-    'haydenmeade/neotest-jest',
+    'nvim-neotest/neotest-jest',
   }
   config = function()
     require('neotest').setup({
@@ -54,7 +54,7 @@ require('neotest').setup({
   ...,
   adapters = {
     require('neotest-jest')({
-      jestCommand = "jest --watch ",
+      jestCommand = require('neotest-jest.jest-util').getJestCommand(vim.fn.expand '%:p:h') .. ' --watch',
     }),
   }
 })

lua/neotest-jest/init.lua

@@ -104,7 +104,7 @@ function adapter.is_test_file(file_path)
     is_test_file = true
   end
 
-  for _, x in ipairs({ "spec", "test", "unit", "regression", "integration" }) do
+  for _, x in ipairs({ "spec", "e2e%-spec", "test", "unit", "regression", "integration" }) do
     for _, ext in ipairs({ "js", "jsx", "coffee", "ts", "tsx" }) do
       if string.match(file_path, "%." .. x .. "%." .. ext .. "$") then
         is_test_file = true
@@ -416,6 +416,7 @@ function adapter.build_spec(args)
     "--json",
     "--outputFile=" .. results_path,
     "--testNamePattern=" .. testNamePattern,
+    "--forceExit",
     vim.fs.normalize(pos.path),
   })
 

tests/init_spec.lua

@@ -236,6 +236,26 @@ describe("build_spec", function()
     assert.is.truthy(spec.context.results_path)
   end)
 
+  async.it("builds command for file test with jestCommand arg", function()
+    local positions = plugin.discover_positions("./spec/basic.test.ts"):to_list()
+    local tree = Tree.from_list(positions, function(pos)
+      return pos.id
+    end)
+    local spec = plugin.build_spec({ tree = tree, jestCommand = 'jest --watch ' })
+
+    assert.is.truthy(spec)
+    local command = spec.command
+    assert.is.truthy(command)
+    assert.contains(command, "jest")
+    assert.contains(command, "--watch")
+    assert.contains(command, "--json")
+    assert.is_not.contains(command, "--config=jest.config.js")
+    assert.contains(command, "--testNamePattern='.*'")
+    assert.contains(command, "./spec/basic.test.ts")
+    assert.is.truthy(spec.context.file)
+    assert.is.truthy(spec.context.results_path)
+  end)
+
   async.it("builds command for namespace", function()
     local positions = plugin.discover_positions("./spec/basic.test.ts"):to_list()