From 00f154ccd27e4ea497d9f242535f49d34b27aecb Mon Sep 17 00:00:00 2001
From: Mike Cheng <orbzor@gmail.com>
Date: Tue, 5 Mar 2024 18:59:10 -0500
Subject: [PATCH] fix: prefix -run in GoTestXXX with '-test' (#435)

When providing custom arguments (`:GoTest-n -a -test.timeout=5s`), the
resultant command will be:

`go test <package> -args -test.timeout=5s -run=<exp>`

Since `-run` is after `-args`, the `-test.` prefix is required to be
properly detected. According to `go help testflags`, all test commands
are recognized with this prefix.
---
 lua/go/gotest.lua          |  8 ++++----
 lua/tests/go_test_spec.lua | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lua/go/gotest.lua b/lua/go/gotest.lua
index a6a464e..9032dbd 100644
--- a/lua/go/gotest.lua
+++ b/lua/go/gotest.lua
@@ -218,7 +218,7 @@ local function cmd_builder(path, args)
 
   if optarg['r'] then
     log('run test', optarg['r'])
-    table.insert(cmd, '-run')
+    table.insert(cmd, '-test.run')
     table.insert(cmd, optarg['r'])
   end
 
@@ -470,9 +470,9 @@ local function run_tests_with_ts_node(args, func_node, tblcase_ns)
     end
     vim.list_extend(cmd, bench_opts)
   elseif func_node.name:find('Fuzz') then
-    table.insert(cmd, '-fuzz=' .. func_node.name)
+    table.insert(cmd, '-test.fuzz=' .. func_node.name)
   else
-    table.insert(cmd, '-run=' .. test_name_path)
+    table.insert(cmd, '-test.run=' .. test_name_path)
   end
 
   if test_runner == 'dlv' then
@@ -634,7 +634,7 @@ M.test_file = function(...)
   --
   local cmd_args, optarg = cmd_builder(relpath, args)
 
-  table.insert(cmd_args, '-run')
+  table.insert(cmd_args, '-test.run')
 
   if is_windows then
     tests = '"' .. tests .. '"'
diff --git a/lua/tests/go_test_spec.lua b/lua/tests/go_test_spec.lua
index acd9547..f0aba04 100644
--- a/lua/tests/go_test_spec.lua
+++ b/lua/tests/go_test_spec.lua
@@ -24,7 +24,7 @@ describe('should run func test', function()
     vim.fn.setpos('.', { 0, 5, 11, 0 })
     local cmd = require('go.gotest').test_func()
 
-    eq({ 'go', 'test', './coverage', '-run='^\\QTest_branch\\E$'' }, cmd)
+    eq({ 'go', 'test', './coverage', "-test.run='^\\QTest_branch\\E$'" }, cmd)
   end)
   it('should test function inside a source code', function()
     --
@@ -44,7 +44,7 @@ describe('should run func test', function()
     vim.fn.setpos('.', { 0, 6, 11, 0 })
     local cmd = require('go.gotest').test_func()
 
-    eq({ 'go', 'test', './coverage', '-run="^\\QTest_branch\\E$"' }, cmd)
+    eq({ 'go', 'test', './coverage', "-test.run='^\\QTest_branch\\E$'" }, cmd)
   end)
   it('should test function with additional args to test binary', function()
     --
@@ -69,7 +69,7 @@ describe('should run func test', function()
       './coverage',
       '-args',
       'mock=true',
-      '-run="^\\QTest_branch\\E$"',
+      "-test.run='^\\QTest_branch\\E$'",
     }, cmd)
   end)
 end)
@@ -99,7 +99,7 @@ describe('should run test file', function()
       'go',
       'test',
       'coverage',
-      '-run',
+      '-test.run',
       [['Test_branch|TestBranch|TestBranchSubTest']],
     }, cmd)
   end)
@@ -130,7 +130,7 @@ describe('should run test file with flags', function()
       'test',
       '-tags=tag1',
       'coverage',
-      '-run',
+      '-test.run',
       [['Test_branch|TestBranch|TestBranchSubTest']],
     }, cmd)
   end)
@@ -179,7 +179,7 @@ describe('should run test ', function()
     vim.fn.setpos('.', { 0, 6, 1, 0 })
     local cmd = require('go.gotest').test('-n', '-t', 'tags1')
 
-    eq({ 'go', 'test', '-tags=tags1', './coverage', '-run="^\\QTest_branch\\E$"' }, cmd)
+    eq({ 'go', 'test', '-tags=tags1', './coverage', "-test.run='^\\QTest_branch\\E$'" }, cmd)
   end)
 end)
 
@@ -233,7 +233,7 @@ describe('should run test file with flags inside file', function()
       'test',
       '-tags=tag1,integration,unit',
       'coverage',
-      '-run',
+      '-test.run',
       "'TestTag'",
     }, cmd)
   end)
@@ -256,7 +256,7 @@ describe('should run subcase test', function()
     vim.cmd("silent exe 'e " .. path .. "'")
     vim.fn.setpos('.', { 1, 18, 11, 0 })
     local cmd = require('go.gotest').test_tblcase()
-    eq({ 'go', 'test', './coverage', '-run="^\\QTest_branch\\E$"/"^\\Qa10\\E$"' }, cmd)
+    eq({ 'go', 'test', './coverage', '-test.run=\'^\\QTest_branch\\E$\'/\'^\\Qa10\\E$\'' }, cmd)
   end)
 
   it('should test subcase in table test style when cursor inside test block', function()
@@ -273,7 +273,7 @@ describe('should run subcase test', function()
     vim.cmd("silent exe 'e " .. path .. "'")
     vim.fn.setpos('.', { 1, 29, 12, 0 })
     local cmd = require('go.gotest').test_tblcase()
-    eq({ 'go', 'test', './coverage', '-run="^\\QTest_branch\\E$"/"^\\Qb10 [step 1..3]\\E$"' }, cmd)
+    eq({ 'go', 'test', './coverage', '-test.run=\'^\\QTest_branch\\E$\'/\'^\\Qb10 [step 1..3]\\E$\'' }, cmd)
   end)
 
   it('should test subcase in subtest style', function()
@@ -290,7 +290,7 @@ describe('should run subcase test', function()
     vim.cmd("silent exe 'e " .. path .. "'")
     vim.fn.setpos('.', { 1, 75, 11, 0 })
     local cmd = require('go.gotest').test_tblcase()
-    eq({ 'go', 'test', './coverage', '-run="^\\QTestBranchSubTest\\E$"/"^\\Qa11\\E$"' }, cmd)
+    eq({ 'go', 'test', './coverage', '-test.run=\'^\\QTestBranchSubTest\\E$\'/\'^\\Qa11\\E$\'' }, cmd)
   end)
 
   it('should test subcase in subtest style when cursor insde test block', function()
@@ -307,6 +307,6 @@ describe('should run subcase test', function()
     vim.cmd("silent exe 'e " .. path .. "'")
     vim.fn.setpos('.', { 1, 82, 7, 0 })
     local cmd = require('go.gotest').test_tblcase()
-    eq({ 'go', 'test', './coverage', '-run="^\\QTestBranchSubTest\\E$"/"^\\Qb11\\E$"' }, cmd)
+    eq({ 'go', 'test', './coverage', '-test.run=\'^\\QTestBranchSubTest\\E$\'/\'^\\Qb11\\E$\'' }, cmd)
   end)
 end)