Merge pull request #41 from benlubas/main

Correctly run nested describe test blocks

lua/neotest-jest/init.lua

@@ -132,8 +132,7 @@ end
 
 local function escapeTestPattern(s)
   return (
-    s
-      :gsub("%(", "%\\(")
+    s:gsub("%(", "%\\(")
       :gsub("%)", "%\\)")
       :gsub("%]", "%\\]")
       :gsub("%[", "%\\[")
@@ -144,6 +143,7 @@ local function escapeTestPattern(s)
       :gsub("%$", "%\\$")
       :gsub("%^", "%\\^")
       :gsub("%/", "%\\/")
+      :gsub("%'", "%\\'")
   )
 end
 
@@ -195,12 +195,16 @@ function adapter.build_spec(args)
   local pos = args.tree:data()
   local testNamePattern = "'.*'"
 
-  if pos.type == "test" then
-    testNamePattern = "'" .. escapeTestPattern(pos.name) .. "$'"
-  end
-
-  if pos.type == "namespace" then
-    testNamePattern = "'^" .. escapeTestPattern(pos.name) .. "'"
+  if pos.type == "test" or pos.type == "namespace" then
+    -- pos.id in form "path/to/file::Describe text::test text"
+    local testName = string.sub(pos.id, string.find(pos.id, "::") + 2)
+    testName, _ = string.gsub(testName, "::", " ")
+    testNamePattern = "'^" .. escapeTestPattern(testName)
+    if pos.type == "test" then
+      testNamePattern = testNamePattern .. "$'"
+    else
+      testNamePattern = testNamePattern .. "'"
+    end
   end
 
   local binary = getJestCommand(pos.path)

spec/nestedDescribe.test.ts

@@ -0,0 +1,11 @@
+
+describe('outer', () => {
+  describe('inner', () => {
+    it('should do a thing', () => {
+      expect('hello').toEqual('hello');
+    });
+    it("this has a '", () => {
+      expect('hello').toEqual('hello');
+    });
+  });
+});

tests/init_spec.lua

@@ -157,4 +157,45 @@ describe("build_spec", function()
     assert.is.truthy(spec.context.file)
     assert.is.truthy(spec.context.results_path)
   end)
+
+  async.it("builds command for nested namespace", function()
+    local positions = plugin.discover_positions("./spec/nestedDescribe.test.ts"):to_list()
+
+    local tree = Tree.from_list(positions, function(pos)
+      return pos.id
+    end)
+
+    local spec = plugin.build_spec({ tree = tree:children()[1]:children()[1] })
+
+    assert.is.truthy(spec)
+    local command = spec.command
+    assert.is.truthy(command)
+    assert.contains(command, "jest")
+    assert.contains(command, "--json")
+    assert.is_not.contains(command, "--config=jest.config.js")
+    assert.contains(command, "--testNamePattern='^outer inner'")
+    assert.contains(command, "./spec/nestedDescribe.test.ts")
+    assert.is.truthy(spec.context.file)
+    assert.is.truthy(spec.context.results_path)
+  end)
+
+  async.it("builds correct command for test name with ' ", function()
+    local positions = plugin.discover_positions("./spec/nestedDescribe.test.ts"):to_list()
+
+    local tree = Tree.from_list(positions, function(pos)
+      return pos.id
+    end)
+
+    local spec = plugin.build_spec({ tree = tree:children()[1]:children()[1]:children()[2] })
+    assert.is.truthy(spec)
+    local command = spec.command
+    assert.is.truthy(command)
+    assert.contains(command, "jest")
+    assert.contains(command, "--json")
+    assert.is_not.contains(command, "--config=jest.config.js")
+    assert.contains(command, "--testNamePattern='^outer inner this has a \\'$'")
+    assert.contains(command, "./spec/nestedDescribe.test.ts")
+    assert.is.truthy(spec.context.file)
+    assert.is.truthy(spec.context.results_path)
+  end)
 end)