From d4750100b0e315a608d1f826cac086739c1f8e8e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 30 Jan 2019 19:52:50 +0100
Subject: test: improve reliability of ":terminal topline" test

- Avoid using platform-specific shell, it failed in MINGW_64 env.
- tty-test.c echos our input, which is exactly what we need for this test.
- Test fails correctly if 894f6bee54e8 is reverted.
---
 test/functional/terminal/window_spec.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/functional')

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