From 998cfcf1fdd0a6830d0fc35f1c054a6f55de1e7f Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Fri, 8 Nov 2024 11:52:26 +0200
Subject: [PATCH] test(extra): adjust to pass on Nightly

Details:
- There seems to be new commands added.
- An ongoing options rewrite seems to have made it impossible for
  `vim.o`/`vim.bo`/`vim.wo` to error for option name that is listed in
  the `vim.api.nvim_get_all_options_info()`.
---
 lua/mini/extra.lua   |  1 +
 tests/test_extra.lua | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lua/mini/extra.lua b/lua/mini/extra.lua
index 8c7a8e8d..2133b0e9 100644
--- a/lua/mini/extra.lua
+++ b/lua/mini/extra.lua
@@ -1245,6 +1245,7 @@ MiniExtra.pickers.options = function(local_opts, opts)
     local has_value, value = pcall(function()
       return vim.api.nvim_win_call(target_win_id, function() return vim[value_source][item.info.name] end)
     end)
+    -- TODO: consider removing after Neovim<=0.10 compatibility is dropped
     if not has_value then value = '<Option is deprecated (will be removed in later Neovim versions)>' end
 
     local lines = { 'Value:', unpack(vim.split(vim.inspect(value), '\n')), '', 'Info:' }
diff --git a/tests/test_extra.lua b/tests/test_extra.lua
index b9ee593a..35dde46c 100644
--- a/tests/test_extra.lua
+++ b/tests/test_extra.lua
@@ -904,12 +904,12 @@ T['pickers']['commands()']['works'] = function()
   child.lua_notify('_G.return_item = MiniExtra.pickers.commands()')
   validate_picker_name('Commands')
   type_keys("'chdir")
-  child.expect_screenshot()
+  child.expect_screenshot({ ignore_lines = { 9 } })
 
   -- Should have proper preview
   type_keys('<Tab>')
   -- - No data for built-in commands is yet available
-  child.expect_screenshot()
+  child.expect_screenshot({ ignore_lines = { 9 } })
 
   -- Should properly choose
   type_keys('<CR>')
@@ -932,9 +932,9 @@ T['pickers']['commands()']['respects user commands'] = function()
 
   -- Should have proper preview with data
   type_keys('<Tab>')
-  child.expect_screenshot()
+  child.expect_screenshot({ ignore_lines = { 24 } })
   type_keys('<C-n>')
-  child.expect_screenshot()
+  child.expect_screenshot({ ignore_lines = { 24 } })
 
   -- Should on choose execute command if it is without arguments
   type_keys('<C-p>', '<CR>')
@@ -2943,6 +2943,8 @@ T['pickers']['options()']['correctly chooses non-binary options'] = function()
 end
 
 T['pickers']['options()']['correctly previews deprecated options'] = function()
+  -- There shouldn't be "deprecated" options listed after Neovim 0.11 refactors
+  if child.fn.has('nvim-0.11') == 1 then return end
   child.set_size(10, 115)
   pick_options()
   type_keys('^aleph', '<Tab>')