diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-02 23:10:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 23:10:26 +0100 |
| commit | b19403e73e515786d2fcdb23674e3e29e62857b1 (patch) | |
| tree | 8ecc2ce4abcbb928fbf1b862e27ddefd5546d345 /test | |
| parent | 109a792e25c6120afc554c74bd539ee19ad21a85 (diff) | |
| parent | 471129792c67b42e23034b30d35872cb092aa2cc (diff) | |
| download | rneovim-b19403e73e515786d2fcdb23674e3e29e62857b1.tar.gz rneovim-b19403e73e515786d2fcdb23674e3e29e62857b1.tar.bz2 rneovim-b19403e73e515786d2fcdb23674e3e29e62857b1.zip | |
Merge #9291 'vim-patch:8.1.{550,551}'
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/ex_cmds/debug_spec.lua | 142 | ||||
| -rw-r--r-- | test/functional/legacy/108_backtrace_debug_commands_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/cmdline_spec.lua | 82 | ||||
| -rw-r--r-- | test/functional/ui/embed_spec.lua | 2 |
4 files changed, 113 insertions, 115 deletions
diff --git a/test/functional/ex_cmds/debug_spec.lua b/test/functional/ex_cmds/debug_spec.lua index 5dad8098ea..a4d381d3f1 100644 --- a/test/functional/ex_cmds/debug_spec.lua +++ b/test/functional/ex_cmds/debug_spec.lua @@ -7,7 +7,7 @@ describe(':debug', function() local screen before_each(function() clear() - screen = Screen.new(50, 14) + screen = Screen.new(30, 14) screen:set_default_attr_ids({ [1] = {bold = true, foreground = Screen.colors.Blue1}, [2] = {bold = true, reverse = true}, @@ -19,92 +19,92 @@ describe(':debug', function() it('scrolls messages correctly', function() feed(':echoerr bork<cr>') screen:expect([[ - | - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {2: }| - {3:E121: Undefined variable: bork} | - {3:E15: Invalid expression: bork} | - {4:Press ENTER or type command to continue}^ | + | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {2: }| + {3:E121: Undefined variable: bork}| + | + {4:Press ENTER or type command to}| + {4: continue}^ | ]]) feed(':debug echo "aa"| echo "bb"<cr>') screen:expect([[ - | - {1:~ }| - {1:~ }| - {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" | - >^ | + | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {2: }| + {3:E121: Undefined variable: bork}| + | + {4:Press ENTER or type command to}| + Entering Debug mode. Type "co| + nt" to continue. | + cmd: echo "aa"| echo "bb" | + >^ | ]]) feed('step<cr>') screen:expect([[ - | - {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 | - aa | - cmd: echo "bb" | - >^ | + | + {1:~ }| + {1:~ }| + {2: }| + {3:E121: Undefined variable: bork}| + | + {4:Press ENTER or type command to}| + Entering Debug mode. Type "co| + nt" to continue. | + cmd: echo "aa"| echo "bb" | + >step | + aa | + cmd: echo "bb" | + >^ | ]]) feed('step<cr>') screen:expect([[ - | - {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 | - aa | - cmd: echo "bb" | - >step | - bb | - {4:Press ENTER or type command to continue}^ | + {2: }| + {3:E121: Undefined variable: bork}| + | + {4:Press ENTER or type command to}| + Entering Debug mode. Type "co| + nt" to continue. | + cmd: echo "aa"| echo "bb" | + >step | + aa | + cmd: echo "bb" | + >step | + bb | + {4:Press ENTER or type command to}| + {4: continue}^ | ]]) feed('<cr>') screen:expect([[ - ^ | - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + | ]]) end) end) diff --git a/test/functional/legacy/108_backtrace_debug_commands_spec.lua b/test/functional/legacy/108_backtrace_debug_commands_spec.lua index 9ace4ef093..1c1a2095d5 100644 --- a/test/functional/legacy/108_backtrace_debug_commands_spec.lua +++ b/test/functional/legacy/108_backtrace_debug_commands_spec.lua @@ -121,7 +121,6 @@ describe('108', function() Error detected while processing function Foo[2]..Bar[2]..Bazz: line 3: E121: Undefined variable: var3 - E15: Invalid expression: var3 here var3 is defined with "another var": another var @@ -129,7 +128,6 @@ describe('108', function() Error detected while processing function Foo[2]..Bar: line 3: E121: Undefined variable: var2 - E15: Invalid expression: var2 here var2 is defined with 10: 10 diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua index 0ebb62f78f..5d112d7f35 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(35,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:~ }| + {3: }| + {4:E121: Undefined variable: doesnotex}| + {4:ist} | + {5:Press ENTER or type command to cont}| + {5:inue}^ | ]]} 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:~ }| + {3: }| + {4:E121: Undefined variable: doesnotex}| + {4:ist} | + {5:Press ENTER or type command to cont}| + {4:E121: Undefined variable: doesnotex}| + {4:ist} | + {5:Press ENTER or type command to cont}| + {5:inue}^ | ]]} 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}^ | + {4:E121: Undefined variable: doesnotex}| + {4:ist} | + {5:Press ENTER or type command to cont}| + {4:E121: Undefined variable: doesnotex}| + {4:ist} | + {5:Press ENTER or type command to cont}| + {4:E121: Undefined variable: doesnotex}| + {4:ist} | + {5:Press ENTER or type command to cont}| + {5:inue}^ | ]]} feed('<cr>') screen:expect{grid=[[ - ^ | - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {1:~ }| - {3:n }| - | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {3:n }| + | ]]} 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^ | ]]) |