Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: Screen:expect: support "{MATCH:…}" #11004

Merged
merged 2 commits into from
Nov 10, 2019
Merged

tests: Screen:expect: support "{MATCH:…}" #11004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0abaf9
tests: Screen:expect: support "{MATCH:…}"
blueyed Sep 12, 2019
4abb67c
test/Screen:expect: replace "{IGNORE}" with "{MATCH:…}"
justinmk Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/functional/terminal/scrollback_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ describe("'scrollback' option", function()
38: line |
39: line |
40: line |
{IGNORE}|
{MATCH:.*}|
{3:-- TERMINAL --} |
]]}
end
Expand Down
2 changes: 1 addition & 1 deletion test/functional/terminal/tui_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ describe('TUI', function()
|
{4:~ }|
{5: }|
{8:paste: Error executing lua: vim.lua:214: Vim:E21: }|
{MATCH:paste: Error executing lua: vim.lua:%d+: Vim:E21: }|
{8:Cannot make changes, 'modifiable' is off} |
{10:Press ENTER or type command to continue}{1: } |
{3:-- TERMINAL --} |
Expand Down
14 changes: 7 additions & 7 deletions test/functional/ui/messages_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe('ui/ext_messages', function()
feed('G$x')
screen:expect{grid=[[
line 1 |
{IGNORE}|
{MATCH:.*}|
{1:~ }|
{1:~ }|
{1:~ }|
Expand Down Expand Up @@ -966,7 +966,7 @@ describe('ui/ext_messages', function()
{1:~ }|
{1:~ }|
{1:~ }|
{IGNORE}|
{MATCH:.*}|
{1:~ }|
{1:~ }Nvim is open source and freely distributable{1: }|
{1:~ }https://neovim.io/#chat{1: }|
Expand All @@ -976,8 +976,8 @@ describe('ui/ext_messages', function()
{1:~ }type :q{5:<Enter>} to exit {1: }|
{1:~ }type :help{5:<Enter>} for help {1: }|
{1:~ }|
{IGNORE}|
{IGNORE}|
{MATCH:.*}|
{MATCH:.*}|
{1:~ }|
{1:~ }|
{1:~ }|
Expand Down Expand Up @@ -1022,7 +1022,7 @@ describe('ui/ext_messages', function()
|
|
|
{IGNORE}|
{MATCH:.*}|
|
Nvim is open source and freely distributable |
https://neovim.io/#chat |
Expand All @@ -1032,8 +1032,8 @@ describe('ui/ext_messages', function()
type :q{5:<Enter>} to exit |
type :help{5:<Enter>} for help |
|
{IGNORE}|
{IGNORE}|
{MATCH:.*}|
{MATCH:.*}|
|
|
|
Expand Down
9 changes: 5 additions & 4 deletions test/functional/ui/screen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ local ext_keys = {
-- grid: Expected screen state (string). Each line represents a screen
-- row. Last character of each row (typically "|") is stripped.
-- Common indentation is stripped.
-- Lines containing only "{IGNORE}|" are skipped.
-- "{MATCH:x}|" lines are matched against Lua pattern `x`.
-- attr_ids: Expected text attributes. Screen rows are transformed according
-- to this table, as follows: each substring S composed of
-- characters having the same attributes will be substituted by
Expand Down Expand Up @@ -390,9 +390,10 @@ function Screen:expect(expected, attr_ids, ...)
err_msg = "Expected screen height " .. #expected_rows
.. ' differs from actual height ' .. #actual_rows .. '.'
end
for i = 1, #expected_rows do
msg_expected_rows[i] = expected_rows[i]
if expected_rows[i] ~= actual_rows[i] and expected_rows[i] ~= "{IGNORE}|" then
for i, row in ipairs(expected_rows) do
msg_expected_rows[i] = row
local m = (row ~= actual_rows[i] and row:match('{MATCH:(.*)}') or nil)
if row ~= actual_rows[i] and (not m or not actual_rows[i]:match(m)) then
msg_expected_rows[i] = '*' .. msg_expected_rows[i]
if i <= #actual_rows then
actual_rows[i] = '*' .. actual_rows[i]
Expand Down