From b32396170f2c1cd17f36b8a5eb1ad313f6f9a8c3 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 28 Feb 2016 04:49:26 +0300 Subject: main: Make using :edit term:// run TermOpen event Ref #4306 --- test/functional/terminal/edit_spec.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/functional/terminal/edit_spec.lua (limited to 'test/functional/terminal/edit_spec.lua') diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua new file mode 100644 index 0000000000..924f90e8f8 --- /dev/null +++ b/test/functional/terminal/edit_spec.lua @@ -0,0 +1,23 @@ +local helpers = require('test.functional.helpers') + +local nvim_dir = helpers.nvim_dir +local command = helpers.command +local meths = helpers.meths +local clear = helpers.clear +local eq = helpers.eq + +describe(':edit term://*', function() + before_each(function() + clear() + meths.set_option('shell', nvim_dir .. '/shell-test') + end) + + it('runs TermOpen event', function() + meths.set_var('termopen_runs', {}) + command('autocmd TermOpen * :call add(g:termopen_runs, expand(""))') + command('edit term://') + termopen_runs = meths.get_var('termopen_runs') + eq(1, #termopen_runs) + eq(termopen_runs[1], termopen_runs[1]:match('^term://.//%d+:$')) + end) +end) -- cgit From 712f057ed91bd74039836628acd9543fd4d889f6 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 28 Feb 2016 06:54:05 +0300 Subject: functests: Make sure that setting scrollback size works from TermOpen --- test/functional/terminal/edit_spec.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'test/functional/terminal/edit_spec.lua') diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua index 924f90e8f8..1062bb4843 100644 --- a/test/functional/terminal/edit_spec.lua +++ b/test/functional/terminal/edit_spec.lua @@ -1,5 +1,8 @@ local helpers = require('test.functional.helpers') +local screen = require('test.functional.ui.screen') +local curbufmeths = helpers.curbufmeths +local curwinmeths = helpers.curwinmeths local nvim_dir = helpers.nvim_dir local command = helpers.command local meths = helpers.meths @@ -10,6 +13,7 @@ describe(':edit term://*', function() before_each(function() clear() meths.set_option('shell', nvim_dir .. '/shell-test') + meths.set_option('shellcmdflag', 'EXE') end) it('runs TermOpen event', function() @@ -20,4 +24,28 @@ describe(':edit term://*', function() eq(1, #termopen_runs) eq(termopen_runs[1], termopen_runs[1]:match('^term://.//%d+:$')) end) + + it('runs TermOpen early enough to respect terminal_scrollback_buffer_size', function() + local rep = 'a' + meths.set_option('shellcmdflag', 'REP ' .. rep) + local rep_size = rep:byte() + local sb = 10 + local gsb = 20 + meths.set_var('terminal_scrollback_buffer_size', gsb) + command('autocmd TermOpen * :let b:terminal_scrollback_buffer_size = ' + .. tostring(sb)) + command('edit term://foobar') + local bufcontents = {} + local winheight = curwinmeths.get_height() + -- I have no idea why there is + 4 needed. But otherwise it works fine with + -- different scrollbacks. + local shift = -4 + for i = (rep_size - 1 - sb - winheight - shift),(rep_size - 1) do + bufcontents[#bufcontents + 1] = ('%d: foobar'):format(i) + end + bufcontents[#bufcontents + 1] = '' + bufcontents[#bufcontents + 1] = '[Process exited 0]' + command('sleep 500m') + eq(bufcontents, curbufmeths.get_line_slice(1, -1, true, true)) + end) end) -- cgit From a16d4a2b62c8727c05dcf72163efccc6dfc2f5a8 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 28 Feb 2016 08:12:55 +0300 Subject: functests: Make test more robust --- test/functional/terminal/edit_spec.lua | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'test/functional/terminal/edit_spec.lua') diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua index 1062bb4843..3ad1b33970 100644 --- a/test/functional/terminal/edit_spec.lua +++ b/test/functional/terminal/edit_spec.lua @@ -10,6 +10,12 @@ local clear = helpers.clear local eq = helpers.eq describe(':edit term://*', function() + local get_screen = function(columns, lines) + local scr = screen.new(columns, lines) + scr:attach(false) + return scr + end + before_each(function() clear() meths.set_option('shell', nvim_dir .. '/shell-test') @@ -26,6 +32,8 @@ describe(':edit term://*', function() end) it('runs TermOpen early enough to respect terminal_scrollback_buffer_size', function() + local columns, lines = 20, 4 + local scr = get_screen(columns, lines) local rep = 'a' meths.set_option('shellcmdflag', 'REP ' .. rep) local rep_size = rep:byte() @@ -40,12 +48,29 @@ describe(':edit term://*', function() -- I have no idea why there is + 4 needed. But otherwise it works fine with -- different scrollbacks. local shift = -4 - for i = (rep_size - 1 - sb - winheight - shift),(rep_size - 1) do - bufcontents[#bufcontents + 1] = ('%d: foobar'):format(i) + local buf_cont_start = rep_size - 1 - sb - winheight - shift + local bufline = function(i) return ('%d: foobar'):format(i) end + for i = buf_cont_start,(rep_size - 1) do + bufcontents[#bufcontents + 1] = bufline(i) end bufcontents[#bufcontents + 1] = '' bufcontents[#bufcontents + 1] = '[Process exited 0]' - command('sleep 500m') + -- Do not ask me why displayed screen is one line *before* buffer + -- contents: buffer starts with 87:, screen with 86:. + local exp_screen = '\n' + local did_cursor = false + local shift = 10 + for i = 0,(winheight - 1) do + local line = bufline(buf_cont_start + i - 1) + exp_screen = (exp_screen + .. (did_cursor and '' or '^') + .. line + .. (' '):rep(columns - #line) + .. '|\n') + did_cursor = true + end + exp_screen = exp_screen .. (' '):rep(columns) .. '|\n' + scr:expect(exp_screen) eq(bufcontents, curbufmeths.get_line_slice(1, -1, true, true)) end) end) -- cgit