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

Merge pull request #17527 from zeertzjq/test-pending-win32

Browse Source 
test: use helpers.pending_win32(pending) instead of iswin()
This commit is contained in:
zeertzjq
2022-02-26 21:17:38 +08:00
committed by GitHub
parent d0f8f76224 0545bd2180
commit 41f309adeb
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/functional/api/buffer_updates_spec.lua
View File

@@ -824,6 +824,7 @@ describe('API: buffer events:', function()
end end
msg = next_msg() msg = next_msg()
end end
-- FIXME: Windows
assert(iswin(), 'did not match/receive expected nvim_buf_lines_event lines') assert(iswin(), 'did not match/receive expected nvim_buf_lines_event lines')
end end

4
test/functional/ex_cmds/mksession_spec.lua
View File

@@ -10,12 +10,11 @@ local funcs = helpers.funcs
local matches = helpers.matches local matches = helpers.matches
local pesc = helpers.pesc local pesc = helpers.pesc
local rmdir = helpers.rmdir local rmdir = helpers.rmdir
local iswin = helpers.iswin
local file_prefix = 'Xtest-functional-ex_cmds-mksession_spec' local file_prefix = 'Xtest-functional-ex_cmds-mksession_spec'
describe(':mksession', function() describe(':mksession', function()
if not iswin() then if helpers.pending_win32(pending) then return end
local session_file = file_prefix .. '.vim' local session_file = file_prefix .. '.vim'
local tab_dir = file_prefix .. '.d' local tab_dir = file_prefix .. '.d'
@@ -117,5 +116,4 @@ describe(':mksession', function()
matches('^term://'..pesc(expected_cwd)..'//%d+:', funcs.expand('%')) matches('^term://'..pesc(expected_cwd)..'//%d+:', funcs.expand('%'))
command('qall!') command('qall!')
end) end)
end
end) end)

7
test/functional/terminal/cursor_spec.lua
View File

@@ -8,7 +8,6 @@ local eq, eval = helpers.eq, helpers.eval
local feed_command = helpers.feed_command local feed_command = helpers.feed_command
local hide_cursor = thelpers.hide_cursor local hide_cursor = thelpers.hide_cursor
local show_cursor = thelpers.show_cursor local show_cursor = thelpers.show_cursor
local iswin = helpers.iswin
describe(':terminal cursor', function() describe(':terminal cursor', function()
local screen local screen
@@ -178,7 +177,7 @@ describe('cursor with customized highlighting', function()
end) end)
describe('buffer cursor position is correct in terminal without number column', function() describe('buffer cursor position is correct in terminal without number column', function()
if not iswin() then if helpers.pending_win32(pending) then return end
local screen local screen
local function setup_ex_register(str) local function setup_ex_register(str)
@@ -526,11 +525,10 @@ describe('buffer cursor position is correct in terminal without number column',
eq({6, 1}, eval('nvim_win_get_cursor(0)')) eq({6, 1}, eval('nvim_win_get_cursor(0)'))
end) end)
end) end)
end
end) end)
describe('buffer cursor position is correct in terminal with number column', function() describe('buffer cursor position is correct in terminal with number column', function()
if not iswin() then if helpers.pending_win32(pending) then return end
local screen local screen
local function setup_ex_register(str) local function setup_ex_register(str)
@@ -881,5 +879,4 @@ describe('buffer cursor position is correct in terminal with number column', fun
eq({6, 1}, eval('nvim_win_get_cursor(0)')) eq({6, 1}, eval('nvim_win_get_cursor(0)'))
end) end)
end) end)
end
end) end)

3
test/functional/ui/output_spec.lua
View File

@@ -14,7 +14,7 @@ local has_powershell = helpers.has_powershell
local set_shell_powershell = helpers.set_shell_powershell local set_shell_powershell = helpers.set_shell_powershell
describe("shell command :!", function() describe("shell command :!", function()
if not iswin() then if helpers.pending_win32(pending) then return end
local screen local screen
before_each(function() before_each(function()
clear() clear()
@@ -78,7 +78,6 @@ describe("shell command :!", function()
[10] = {foreground = 2}, [10] = {foreground = 2},
}) })
end) end)
end
end) end)
describe("shell command :!", function() describe("shell command :!", function()