From de2a5ec2638315df4ce83a8c2b06274eb1908b5a Mon Sep 17 00:00:00 2001
From: MagicDuck <sbadragan@gmail.com>
Date: Mon, 9 Sep 2024 04:14:27 -0700
Subject: [PATCH] fixing astgrep test

---
 tests/astgrep/test_search.lua                 |   4 +-
 tests/base/test_replace.lua                   |   4 +-
 ...-with-flags-resulting-in-plain-text-output |  51 ----
 ...h-flags-resulting-in-plain-text-output-002 | 269 ------------------
 ...ce.lua---can-replace-with-empty-string-003 |  32 +--
 5 files changed, 19 insertions(+), 341 deletions(-)
 delete mode 100644 tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output
 delete mode 100644 tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output-002

diff --git a/tests/astgrep/test_search.lua b/tests/astgrep/test_search.lua
index 2233d60..07c8802 100644
--- a/tests/astgrep/test_search.lua
+++ b/tests/astgrep/test_search.lua
@@ -129,9 +129,7 @@ T['can search with flags resulting in plain text output'] = function()
   })
 
   helpers.childWaitForFinishedStatus(child)
-
-  helpers.childExpectScreenshot(child)
-  helpers.childExpectBufLines(child)
+  helpers.childWaitForScreenshotText(child, 'Usage: sg run')
 end
 
 T['can search with particular file in paths'] = function()
diff --git a/tests/base/test_replace.lua b/tests/base/test_replace.lua
index b016bdf..0807cce 100644
--- a/tests/base/test_replace.lua
+++ b/tests/base/test_replace.lua
@@ -175,8 +175,8 @@ T['can replace with empty string'] = function()
   helpers.childExpectScreenshot(child)
   helpers.childExpectBufLines(child)
 
-  child.type_keys('<esc>cc', 'and')
-  helpers.childWaitForScreenshotText(child, 'and  walks')
+  child.type_keys('<esc>cc', 'drinks')
+  helpers.childWaitForScreenshotText(child, '1 matches in 1 files')
   helpers.childWaitForFinishedStatus(child)
   helpers.childExpectScreenshot(child)
 end
diff --git a/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output b/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output
deleted file mode 100644
index 3681929..0000000
--- a/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output
+++ /dev/null
@@ -1,51 +0,0 @@
---|---------|---------|---------|---------|---------|---------|---------|---------|
-01|  Actions / Help <g?>    Replace <,r>    Sync All <,s> ...                   
-02|                                                                                
-03|  Search:                                                                      
-04| grug.$A                                                                        
-05|  Replace:                                                                     
-06|                                                                                
-07|  Files Filter:                                                                
-08|                                                                                
-09| 󰮚 Flags:                                                                       
-10| --help                                                                         
-11|  Paths:                                                                       
-12|                                                                                
-13|                                                                                
-14| STATUS_SUCCESS ⟪ astgrep ⟫
-15|                                                                                
-16| Run one time search or rewrite in command line. (default command)              
-17|                                                                                
-18| Usage: sg run [OPTIONS] --pattern <PATTERN> [PATHS]...                         
-19|                                                                                
-20| Arguments:                                                                     
-21|   [PATHS]...                                                                   
-22|           The paths to search. You can provide multiple paths separated by s@@@
-23|Grug FAR - 1: grug.$A                                         3,8            Top
-24|-- INSERT --                                                                    
-
---|---------|---------|---------|---------|---------|---------|---------|---------|
-01|01111111111111111111112221111111111111122211111111111111122222222222222222222222
-02|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-03|33333333332222222222222222222222222222222222222222222222222222222222222222222222
-04|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-05|33333333333222222222222222222222222222222222222222222222222222222222222222222222
-06|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-07|33333333333333332222222222222222222222222222222222222222222222222222222222222222
-08|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-09|33333333322222222222222222222222222222222222222222222222222222222222222222222222
-10|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-11|33333333322222222222222222222222222222222222222222222222222222222222222222222222
-12|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-13|22222222222222222222222222222222222222222222222222222222222222222222222222222222
-14|44444444444444444444444444444444444444444444444444444444444444444444444444444444
-15|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-16|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-17|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-18|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-19|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-20|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-21|02222222222222222222222222222222222222222222222222222222222222222222222222222222
-22|02222222222222222222222222222222222222222222222222222222222222222222222222222000
-23|55555555555555555555555555555555555555555555555555555555555555555555555555555555
-24|11111111111166666666666666666666666666666666666666666666666666666666666666666666
diff --git a/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output-002 b/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output-002
deleted file mode 100644
index d0aaad5..0000000
--- a/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-flags-resulting-in-plain-text-output-002
+++ /dev/null
@@ -1,269 +0,0 @@
----|
-001|
-002|
-003|grug.$A
-004|
-005|
-006|--help
-007|
-008|
-009|Run one time search or rewrite in command line. (default command)
-010|
-011|Usage: sg run [OPTIONS] --pattern <PATTERN> [PATHS]...
-012|
-013|Arguments:
-014|  [PATHS]...
-015|          The paths to search. You can provide multiple paths separated by spaces
-016|          
-017|          [default: .]
-018|
-019|Options:
-020|  -p, --pattern <PATTERN>
-021|          AST pattern to match
-022|
-023|  -r, --rewrite <FIX>
-024|          String to replace the matched AST node
-025|
-026|  -l, --lang <LANG>
-027|          The language of the pattern. For full language list, visit https://ast-grep.github.io/reference/languages.html
-028|
-029|      --debug-query[=<format>]
-030|          Print query pattern's tree-sitter AST. Requires lang be set explicitly
-031|
-032|          Possible values:
-033|          - pattern: Print the query parsed in Pattern format
-034|          - ast:     Print the query in tree-sitter AST format, only named nodes are shown
-035|          - cst:     Print the query in tree-sitter CST format, both named and unnamed nodes are shown
-036|          - sexp:    Print the query in S-expression format
-037|
-038|      --strictness <STRICTNESS>
-039|          The strictness of the pattern
-040|
-041|          Possible values:
-042|          - cst:       Match exact all node
-043|          - smart:     Match all node except source trivial nodes
-044|          - ast:       Match only ast nodes
-045|          - relaxed:   Match ast node except comments
-046|          - signature: Match ast node except comments, without text
-047|
-048|      --no-ignore <FILE_TYPE>
-049|          Do not respect hidden file system or ignore files (.gitignore, .ignore, etc.).
-050|          
-051|          You can suppress multiple ignore files by passing `no-ignore` multiple times.
-052|
-053|          Possible values:
-054|          - hidden:  Search hidden files and directories. By default, hidden files and directories are skipped
-055|          - dot:     Don't respect .ignore files. This does *not* affect whether ast-grep will ignore files and directories whose names begin with a dot. For that, use --no-ignore hidden
-056|          - exclude: Don't respect ignore files that are manually configured for the repository such as git's '.git/info/exclude'
-057|          - global:  Don't respect ignore files that come from "global" sources such as git's `core.excludesFile` configuration option (which defaults to `$HOME/.config/git/ignore`)
-058|          - parent:  Don't respect ignore files (.gitignore, .ignore, etc.) in parent directories
-059|          - vcs:     Don't respect version control ignore files (.gitignore, etc.). This implies --no-ignore parent for VCS files. Note that .ignore files will continue to be respected
-060|
-061|      --stdin
-062|          Enable search code from StdIn.
-063|          
-064|          Use this if you need to take code stream from standard input.
-065|
-066|  -i, --interactive
-067|          Start interactive edit session.
-068|          
-069|          You can confirm the code change and apply it to files selectively, or you can open text editor to tweak the matched code. Note that code rewrite only happens inside a session.
-070|
-071|
-072|  -U, --update-all
-073|          Apply all rewrite without confirmation if true
-074|
-075|      --json[=<style>]
-076|          Output matches in structured JSON .
-077|          
-078|          If this flag is set, ast-grep will output matches in JSON format. You can pass optional value to this flag by using `--json=<style>` syntax to further control how JSON object is formatted and printed. ast-grep will `pretty`-print JSON if no value is passed. Note, the json flag must use `=` to specify its value. It conflicts with interactive.
-079|
-080|          Possible values:
-081|          - pretty:  Prints the matches as a pretty-printed JSON array, with indentation and line breaks. This is useful for human readability, but not for parsing by other programs. This is the default value for the `--json` option
-082|          - stream:  Prints each match as a separate JSON object, followed by a newline character. This is useful for streaming the output to other programs that can read one object per line
-083|          - compact: Prints the matches as a single-line JSON array, without any whitespace. This is useful for saving space and minimizing the output size
-084|
-085|      --color <WHEN>
-086|          Controls output color.
-087|          
-088|          This flag controls when to use colors. The default setting is 'auto', which means ast-grep will try to guess when to use colors. If ast-grep is printing to a terminal, then it will use colors, but if it is redirected to a file or a pipe, then it will suppress color output. ast-grep will also suppress color output in some other circumstances. For example, no color will be used if the TERM environment variable is not set or set to 'dumb'.
-089|          
-090|          [default: auto]
-091|
-092|          Possible values:
-093|          - auto:   Try to use colors, but don't force the issue. If the output is piped to another program, or the console isn't available on Windows, or if TERM=dumb, or if `NO_COLOR` is defined, for example, then don't use colors
-094|          - always: Try very hard to emit colors. This includes emitting ANSI colors on Windows if the console API is unavailable (not implemented yet)
-095|          - ansi:   Ansi is like Always, except it never tries to use anything other than emitting ANSI color codes
-096|          - never:  Never emit colors
-097|
-098|      --heading <WHEN>
-099|          Controls whether to print the file name as heading.
-100|          
-101|          If heading is used, the file name will be printed as heading before all matches of that file. If heading is not used, ast-grep will print the file path before each match as prefix. The default value `auto` is to use heading when printing to a terminal and to disable heading when piping to another program or redirected to files.
-102|          
-103|          [default: auto]
-104|
-105|          Possible values:
-106|          - auto:   Print heading for terminal tty but not for piped output
-107|          - always: Always print heading regardless of output type
-108|          - never:  Never print heading regardless of output type
-109|
-110|  -A, --after <NUM>
-111|          Show NUM lines after each match.
-112|          
-113|          It conflicts with both the -C/--context flag.
-114|          
-115|          [default: 0]
-116|
-117|  -B, --before <NUM>
-118|          Show NUM lines before each match.
-119|          
-120|          It conflicts with both the -C/--context flag.
-121|          
-122|          [default: 0]
-123|
-124|  -C, --context <NUM>
-125|          Show NUM lines around each match.
-126|          
-127|          This is equivalent to providing both the -B/--before and -A/--after flags with the same value. It conflicts with both the -B/--before and -A/--after flags.
-128|          
-129|          [default: 0]
-130|
-131|  -h, --help
-132|          Print help (see a summary with '-h')
-133|
-
----|-
-001| 
-002| 
-003| 
-004| 
-005| 
-006| 
-007| 
-008| 
-009| 
-010| 
-011| 
-012| 
-013| 
-014| 
-015| 
-016| 
-017| 
-018| 
-019| 
-020| 
-021| 
-022| 
-023| 
-024| 
-025| 
-026| 
-027| 
-028| 
-029| 
-030| 
-031| 
-032| 
-033| 
-034| 
-035| 
-036| 
-037| 
-038| 
-039| 
-040| 
-041| 
-042| 
-043| 
-044| 
-045| 
-046| 
-047| 
-048| 
-049| 
-050| 
-051| 
-052| 
-053| 
-054| 
-055| 
-056| 
-057| 
-058| 
-059| 
-060| 
-061| 
-062| 
-063| 
-064| 
-065| 
-066| 
-067| 
-068| 
-069| 
-070| 
-071| 
-072| 
-073| 
-074| 
-075| 
-076| 
-077| 
-078| 
-079| 
-080| 
-081| 
-082| 
-083| 
-084| 
-085| 
-086| 
-087| 
-088| 
-089| 
-090| 
-091| 
-092| 
-093| 
-094| 
-095| 
-096| 
-097| 
-098| 
-099| 
-100| 
-101| 
-102| 
-103| 
-104| 
-105| 
-106| 
-107| 
-108| 
-109| 
-110| 
-111| 
-112| 
-113| 
-114| 
-115| 
-116| 
-117| 
-118| 
-119| 
-120| 
-121| 
-122| 
-123| 
-124| 
-125| 
-126| 
-127| 
-128| 
-129| 
-130| 
-131| 
-132| 
-133| 
diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003 b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003
index 2b538b0..e872514 100644
--- a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003
+++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003
@@ -2,7 +2,7 @@
 01|    Actions / Help <g?>    Replace <,r>    Sync All <,s> ...                 
 02|                                                                                
 03|  Search:                                                                      
-04|   and                                                                          
+04|   drinks                                                                       
 05|  Replace:                                                                     
 06|                                                                                
 07|  Files Filter:                                                                
@@ -13,15 +13,15 @@
 12|                                                                                
 13|                                                                                
 14| STATUS_SUCCESS ⟪ ripgrep ⟫
-15| 3 matches in 2 files                                                           
+15| 1 matches in 1 files                                                           
 16|                                                                                
-17|   file1.txt                                                                    
-18|-┃ 1:2:   walks                                                              [1]
-19|                                                                                
-20|   file2.doc                                                                    
-21|-┃ 2:14:       talks   drinks                                                [2]
-22|│┃ 3:7:       then  thinks                                                   [3]
-23|Grug FAR - 1: and                                             3,4            Top
+17|   file2.doc                                                                    
+18|-▒ 2:19:       talks and  drinks                                             [1]
+19|│▒ 2:19:       talks and                                                     [2]
+20|                                                                                
+21|~                                                                               
+22|~                                                                               
+23|Grug FAR - 1: drinks                                          3,7            All
 24|-- INSERT --                                                                    
 
 --|---------|---------|---------|---------|---------|---------|---------|---------|
@@ -42,10 +42,10 @@
 15|44444444444444444444442222222222222222222222222222222222222222222222222222222222
 16|00022222222222222222222222222222222222222222222222222222222222222222222222222222
 17|00055555555522222222222222222222222222222222222222222222222222222222222222222222
-18|05562622222222222222222222222222222222222222222222222222222222222222222222223333
-19|00022222222222222222222222222222222222222222222222222222222222222222222222222222
-20|00055555555522222222222222222222222222222222222222222222222222222222222222222222
-21|05562662222222222222222222222222222222222222222222222222222222222222222222223333
-22|05562622222222222222222222222222222222222222222222222222222222222222222222223333
-23|77777777777777777777777777777777777777777777777777777777777777777777777777777777
-24|11111111111188888888888888888888888888888888888888888888888888888888888888888888
+18|06672772222222222222222222666666222222222222222222222222222222222222222222223333
+19|01172772222222222222222222222222222222222222222222222222222222222222222222223333
+20|00022222222222222222222222222222222222222222222222222222222222222222222222222222
+21|00000000000000000000000000000000000000000000000000000000000000000000000000000000
+22|00000000000000000000000000000000000000000000000000000000000000000000000000000000
+23|88888888888888888888888888888888888888888888888888888888888888888888888888888888
+24|11111111111199999999999999999999999999999999999999999999999999999999999999999999