mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-03 17:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: fix screen assertions

Browse Source
This commit is contained in:
Jan Edmund Lazo
2019-09-25 01:56:29 -04:00
parent 90c2abc53f
commit 1f4c9da9c6
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/functional/ui/inccommand_spec.lua
View File

@@ -734,11 +734,11 @@ describe(":substitute, inccommand=split", function()
feed_command("set nomodified") feed_command("set nomodified")
feed(":%s/tw") feed(":%s/tw")
screen:expect([[ screen:expect([[
Inc substitution on |
{12:tw}o lines |
Inc substitution on | Inc substitution on |
{12:tw}o lines | {12:tw}o lines |
| |
{15:~ }|
{15:~ }|
{11:[No Name] }| {11:[No Name] }|
|2| {12:tw}o lines | |2| {12:tw}o lines |
|4| {12:tw}o lines | |4| {12:tw}o lines |
@@ -791,11 +791,11 @@ describe(":substitute, inccommand=split", function()
it('shows split window when typing the pattern', function() it('shows split window when typing the pattern', function()
feed(":%s/tw") feed(":%s/tw")
screen:expect([[ screen:expect([[
Inc substitution on |
{12:tw}o lines |
Inc substitution on | Inc substitution on |
{12:tw}o lines | {12:tw}o lines |
| |
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| {12:tw}o lines | |2| {12:tw}o lines |
|4| {12:tw}o lines | |4| {12:tw}o lines |
@@ -812,11 +812,11 @@ describe(":substitute, inccommand=split", function()
it('shows preview with empty replacement', function() it('shows preview with empty replacement', function()
feed(":%s/tw/") feed(":%s/tw/")
screen:expect([[ screen:expect([[
Inc substitution on |
o lines |
Inc substitution on | Inc substitution on |
o lines | o lines |
| |
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| o lines | |2| o lines |
|4| o lines | |4| o lines |
@@ -831,11 +831,11 @@ describe(":substitute, inccommand=split", function()
feed("x") feed("x")
screen:expect([[ screen:expect([[
Inc substitution on |
{12:x}o lines |
Inc substitution on | Inc substitution on |
{12:x}o lines | {12:x}o lines |
| |
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| {12:x}o lines | |2| {12:x}o lines |
|4| {12:x}o lines | |4| {12:x}o lines |
@@ -850,11 +850,11 @@ describe(":substitute, inccommand=split", function()
feed("<bs>") feed("<bs>")
screen:expect([[ screen:expect([[
Inc substitution on |
o lines |
Inc substitution on | Inc substitution on |
o lines | o lines |
| |
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| o lines | |2| o lines |
|4| o lines | |4| o lines |
@@ -872,11 +872,11 @@ describe(":substitute, inccommand=split", function()
it('shows split window when typing replacement', function() it('shows split window when typing replacement', function()
feed(":%s/tw/XX") feed(":%s/tw/XX")
screen:expect([[ screen:expect([[
Inc substitution on |
{12:XX}o lines |
Inc substitution on | Inc substitution on |
{12:XX}o lines | {12:XX}o lines |
| |
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| {12:XX}o lines | |2| {12:XX}o lines |
|4| {12:XX}o lines | |4| {12:XX}o lines |
@@ -938,11 +938,11 @@ describe(":substitute, inccommand=split", function()
feed(":%s/tw") feed(":%s/tw")
-- 'cursorline' is NOT active during preview. -- 'cursorline' is NOT active during preview.
screen:expect([[ screen:expect([[
Inc substitution on |
{12:tw}o lines | {12:tw}o lines |
Inc substitution on | Inc substitution on |
{12:tw}o lines | {12:tw}o lines |
| |
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| {12:tw}o lines | |2| {12:tw}o lines |
|4| {12:tw}o lines | |4| {12:tw}o lines |
@@ -2205,11 +2205,11 @@ describe(":substitute", function()
feed("/KKK") feed("/KKK")
screen:expect([[ screen:expect([[
T T123 T T123 T2T TT T23423424|
x |
afa {12:KKK}adf la;lkd {12:KKK}alx | afa {12:KKK}adf la;lkd {12:KKK}alx |
| |
{15:~ }| {15:~ }|
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|3| afa {12:KKK}adf la;lkd {12:KKK}alx | |3| afa {12:KKK}adf la;lkd {12:KKK}alx |
{15:~ }| {15:~ }|
@@ -2485,11 +2485,11 @@ describe(":substitute", function()
wait() wait()
feed([[:%s/\(some\)\@<lt>!thing/one/]]) feed([[:%s/\(some\)\@<lt>!thing/one/]])
screen:expect([[ screen:expect([[
something |
every{12:one} | every{12:one} |
someone | someone |
{15:~ }| {15:~ }|
{15:~ }| {15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|2| every{12:one} | |2| every{12:one} |
{15:~ }| {15:~ }|
@@ -2527,11 +2527,11 @@ describe(":substitute", function()
wait() wait()
feed([[:%s/some\(thing\)\@!/every/]]) feed([[:%s/some\(thing\)\@!/every/]])
screen:expect([[ screen:expect([[
something |
everything |
{12:every}one | {12:every}one |
{15:~ }| {15:~ }|
{15:~ }| {15:~ }|
{15:~ }|
{15:~ }|
{11:[No Name] [+] }| {11:[No Name] [+] }|
|3| {12:every}one | |3| {12:every}one |
{15:~ }| {15:~ }|

4
test/functional/ui/mouse_spec.lua
View File

@@ -419,9 +419,9 @@ describe('ui/mouse/input', function()
meths.set_option('showtabline', 2) meths.set_option('showtabline', 2)
screen:expect([[ screen:expect([[
{fill:test-test2 }| {fill:test-test2 }|
testing |
mouse | mouse |
support and selectio^n | support and selectio^n |
{0:~ }|
| |
]]) ]])
meths.set_var('reply', {}) meths.set_var('reply', {})
@@ -539,9 +539,9 @@ describe('ui/mouse/input', function()
feed_command('tabprevious') -- go to first tab feed_command('tabprevious') -- go to first tab
screen:expect([[ screen:expect([[
{sel: + foo }{tab: + bar }{fill: }{tab:X}| {sel: + foo }{tab: + bar }{fill: }{tab:X}|
testing |
mouse | mouse |
support and selectio^n | support and selectio^n |
{0:~ }|
:tabprevious | :tabprevious |
]]) ]])
feed('<LeftMouse><10,0><LeftRelease>') -- go to second tab feed('<LeftMouse><10,0><LeftRelease>') -- go to second tab

6
test/functional/ui/popupmenu_spec.lua
View File

@@ -1491,20 +1491,20 @@ describe('builtin popupmenu', function()
command("split") command("split")
screen:expect([[ screen:expect([[
xx |
choice^ | choice^ |
{1:~ }|
{n:word }{1: }| {n:word }{1: }|
{s:choice }{4: }| {s:choice }{4: }|
{n:text } | {n:text } |
{n:thing }{1: }| {n:thing } |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])
meths.input_mouse('wheel', 'down', '', 0, 6, 15) meths.input_mouse('wheel', 'down', '', 0, 6, 15)
screen:expect{grid=[[ screen:expect{grid=[[
xx |
choice^ | choice^ |
{1:~ }|
{n:word }{1: }| {n:word }{1: }|
{s:choice }{4: }| {s:choice }{4: }|
{n:text } | {n:text } |