Merge #6731 from ZyX-I/fix-oneline-script-skip

3 files changed, 10 insertions, 12 deletions

diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index 89a546675f..aa50f53451 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -3,14 +3,14 @@ local eval, command, feed = helpers.eval, helpers.command, helpers.feed
 local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
 local expect, write_file = helpers.expect, helpers.write_file
 local feed_command = helpers.feed_command
+local missing_provider = helpers.missing_provider
 
 do
   clear()
-  command('let [g:interp, g:errors] = provider#pythonx#Detect(3)')
-  local errors = eval('g:errors')
-  if errors ~= '' then
+  local err = missing_provider('python3')
+  if err then
     pending(
-      'Python 3 (or the Python 3 neovim module) is broken or missing:\n' .. errors,
+      'Python 3 (or the Python 3 neovim module) is broken or missing:\n' .. err,
       function() end)
     return
   end
diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index 94dfa90ea8..25f5e0a6d0 100644
--- a/test/functional/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -12,14 +12,14 @@ local command = helpers.command
 local exc_exec = helpers.exc_exec
 local write_file = helpers.write_file
 local curbufmeths = helpers.curbufmeths
+local missing_provider = helpers.missing_provider
 
 do
   clear()
-  command('let [g:interp, g:errors] = provider#pythonx#Detect(2)')
-  local errors = meths.get_var('errors')
-  if errors ~= '' then
+  local err = missing_provider('python')
+  if err then
     pending(
-      'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. errors,
+      'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. err,
       function() end)
     return
   end
diff --git a/test/functional/provider/ruby_spec.lua b/test/functional/provider/ruby_spec.lua
index 7b0e17688d..9f5ef3b3fc 100644
--- a/test/functional/provider/ruby_spec.lua
+++ b/test/functional/provider/ruby_spec.lua
@@ -10,13 +10,11 @@ local expect = helpers.expect
 local command = helpers.command
 local write_file = helpers.write_file
 local curbufmeths = helpers.curbufmeths
+local missing_provider = helpers.missing_provider
 
 do
   clear()
-  command('let g:prog = provider#ruby#Detect()')
-  local prog = meths.get_var('prog')
-
-  if prog == '' then
+  if missing_provider('ruby') then
     pending(
       "Cannot find the neovim RubyGem. Try :CheckHealth",
       function() end)