mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9565 from justinmk/test

Browse Source
This commit is contained in:
Justin M. Keyes
2019-01-31 22:27:12 +01:00
committed by GitHub
parent 894f6bee54 a494910aa1
commit ada82f3482
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/functional/eval/timer_spec.lua
View File

@@ -145,8 +145,9 @@ describe('timers', function()
local count2 = eval("g:val") local count2 = eval("g:val")
-- when count is eval:ed after timer_stop this should be non-racy -- when count is eval:ed after timer_stop this should be non-racy
eq(count, count2) eq(count, count2)
assert(3 <= count and count <= 7, assert((3 <= count and count <= load_adjust(7)),
'expected (3 <= count <= 7), got: '..tostring(count)) string.format('expected (3 <= count <= %s), got: %s',
load_adjust(7), tostring(count)))
end) end)
it('can be stopped from the handler', function() it('can be stopped from the handler', function()

12
test/functional/terminal/window_spec.lua
View File

@@ -1,5 +1,6 @@
local helpers = require('test.functional.helpers')(after_each) local helpers = require('test.functional.helpers')(after_each)
local thelpers = require('test.functional.terminal.helpers') local thelpers = require('test.functional.terminal.helpers')
local feed_data = thelpers.feed_data
local feed, clear = helpers.feed, helpers.clear local feed, clear = helpers.feed, helpers.clear
local wait = helpers.wait local wait = helpers.wait
local iswin = helpers.iswin local iswin = helpers.iswin
@@ -19,11 +20,10 @@ describe(':terminal window', function()
it('sets topline correctly #8556', function() it('sets topline correctly #8556', function()
-- Test has hardcoded assumptions of dimensions. -- Test has hardcoded assumptions of dimensions.
eq(7, eval('&lines')) eq(7, eval('&lines'))
command('set shell=sh') feed_data('\n\n\n') -- Add blank lines.
command('terminal')
retry(nil, nil, function() assert(nil ~= eval('b:terminal_job_pid')) end)
-- Terminal/shell contents must exceed the height of this window. -- Terminal/shell contents must exceed the height of this window.
command('topleft 1split') command('topleft 1split')
eq('terminal', eval('&buftype'))
feed([[i<cr>]]) feed([[i<cr>]])
-- Check topline _while_ in terminal-mode. -- Check topline _while_ in terminal-mode.
retry(nil, nil, function() eq(6, eval('winsaveview()["topline"]')) end) retry(nil, nil, function() eq(6, eval('winsaveview()["topline"]')) end)
@@ -42,7 +42,7 @@ describe(':terminal window', function()
{7:6 } | {7:6 } |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
thelpers.feed_data({'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}) feed_data({'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'})
screen:expect([[ screen:expect([[
{7:1 }tty ready | {7:1 }tty ready |
{7:2 }rows: 6, cols: 48 | {7:2 }rows: 6, cols: 48 |
@@ -69,7 +69,7 @@ describe(':terminal window', function()
{7: 6 } | {7: 6 } |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
thelpers.feed_data({' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}) feed_data({' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'})
screen:expect([[ screen:expect([[
{7: 1 }tty ready | {7: 1 }tty ready |
{7: 2 }rows: 6, cols: 48 | {7: 2 }rows: 6, cols: 48 |
@@ -113,7 +113,7 @@ describe(':terminal window', function()
describe('with fold set', function() describe('with fold set', function()
before_each(function() before_each(function()
feed([[<C-\><C-N>:set foldenable foldmethod=manual<CR>i]]) feed([[<C-\><C-N>:set foldenable foldmethod=manual<CR>i]])
thelpers.feed_data({'line1', 'line2', 'line3', 'line4', ''}) feed_data({'line1', 'line2', 'line3', 'line4', ''})
screen:expect([[ screen:expect([[
tty ready | tty ready |
line1 | line1 |