diff options
| -rw-r--r-- | test/functional/ex_cmds/debug_spec.lua | 20 | ||||
| -rw-r--r-- | test/functional/ui/cmdline_spec.lua | 82 | ||||
| -rw-r--r-- | test/functional/ui/embed_spec.lua | 2 |
3 files changed, 52 insertions, 52 deletions
diff --git a/test/functional/ex_cmds/debug_spec.lua b/test/functional/ex_cmds/debug_spec.lua index 5dad8098ea..fa1c23c69c 100644 --- a/test/functional/ex_cmds/debug_spec.lua +++ b/test/functional/ex_cmds/debug_spec.lua @@ -19,7 +19,10 @@ describe(':debug', function() it('scrolls messages correctly', function() feed(':echoerr bork<cr>') screen:expect([[ - | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| {1:~ }| {1:~ }| {1:~ }| @@ -29,10 +32,7 @@ describe(':debug', function() {1:~ }| {1:~ }| {1:~ }| - {2: }| {3:E121: Undefined variable: bork} | - {3:E15: Invalid expression: bork} | - {4:Press ENTER or type command to continue}^ | ]]) feed(':debug echo "aa"| echo "bb"<cr>') @@ -45,9 +45,9 @@ describe(':debug', function() {1:~ }| {1:~ }| {1:~ }| + {1:~ }| + {1:~ }| {2: }| - {3:E121: Undefined variable: bork} | - {3:E15: Invalid expression: bork} | Entering Debug mode. Type "cont" to continue. | cmd: echo "aa"| echo "bb" | >^ | @@ -60,9 +60,9 @@ describe(':debug', function() {1:~ }| {1:~ }| {1:~ }| + {1:~ }| + {1:~ }| {2: }| - {3:E121: Undefined variable: bork} | - {3:E15: Invalid expression: bork} | Entering Debug mode. Type "cont" to continue. | cmd: echo "aa"| echo "bb" | >step | @@ -76,9 +76,9 @@ describe(':debug', function() | {1:~ }| {1:~ }| + {1:~ }| + {1:~ }| {2: }| - {3:E121: Undefined variable: bork} | - {3:E15: Invalid expression: bork} | Entering Debug mode. Type "cont" to continue. | cmd: echo "aa"| echo "bb" | >step | diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua index 0ebb62f78f..ec88adee4b 100644 --- a/test/functional/ui/cmdline_spec.lua +++ b/test/functional/ui/cmdline_spec.lua @@ -117,60 +117,60 @@ local function test_cmdline(linegrid) end) it('but not with scrolled messages', function() - screen:try_resize(50,10) + screen:try_resize(49,10) feed(':echoerr doesnotexist<cr>') screen:expect{grid=[[ - | - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {3: }| - {4:E121: Undefined variable: doesnotexist} | - {4:E15: Invalid expression: doesnotexist} | - {5:Press ENTER or type command to continue}^ | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {3:n }| + {4:E121: Undefined variable: doesnotexist} | ]]} feed(':echoerr doesnotexist<cr>') screen:expect{grid=[[ - | - {1:~ }| - {1:~ }| - {1:~ }| - {3: }| - {4:E121: Undefined variable: doesnotexist} | - {4:E15: Invalid expression: doesnotexist} | - {4:E121: Undefined variable: doesnotexist} | - {4:E15: Invalid expression: doesnotexist} | - {5:Press ENTER or type command to continue}^ | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {3:n }| + {4:E121: Undefined variable: doesnotexist} | ]]} feed(':echoerr doesnotexist<cr>') screen:expect{grid=[[ - | - {1:~ }| - {3: }| - {4:E121: Undefined variable: doesnotexist} | - {4:E15: Invalid expression: doesnotexist} | - {4:E121: Undefined variable: doesnotexist} | - {4:E15: Invalid expression: doesnotexist} | - {4:E121: Undefined variable: doesnotexist} | - {4:E15: Invalid expression: doesnotexist} | - {5:Press ENTER or type command to continue}^ | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {3:n }| + {4:E121: Undefined variable: doesnotexist} | ]]} feed('<cr>') screen:expect{grid=[[ - ^ | - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {3:n }| - | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {3:n }| + {4:E121: Undefined variable: doesnotexist} | ]]} end) end) diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua index a7f5cc2bfa..10dbc68672 100644 --- a/test/functional/ui/embed_spec.lua +++ b/test/functional/ui/embed_spec.lua @@ -28,9 +28,9 @@ local function test_embed(ext_linegrid) | | | + | Error detected while processing pre-vimrc command line: | E121: Undefined variable: invalid | - E15: Invalid expression: invalid+ | Press ENTER or type command to continue^ | ]]) |