From 2bf18e7843542dd4ba3bfaa3b09078401bfb6b7b Mon Sep 17 00:00:00 2001
From: Said Al Attrach <alattrach.said@yahoo.com>
Date: Sat, 30 Mar 2019 18:14:20 +0100
Subject: test: move trim to global helpers

---
 test/functional/core/fileio_spec.lua | 9 +++++----
 test/functional/helpers.lua          | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'test/functional')

diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index 94d9536bfc..6468aa9d0a 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -11,6 +11,7 @@ local retry = helpers.retry
 local rmdir = helpers.rmdir
 local sleep = helpers.sleep
 local read_file = helpers.read_file
+local trim = helpers.trim
 
 describe('fileio', function()
   before_each(function()
@@ -79,11 +80,11 @@ describe('fileio', function()
     feed('Abar<esc>')
     command('write')
 
-    local foo_contents = read_file('Xtest_startup_file1')
-    local bar_contents = read_file('Xtest_startup_file1~')
+    local foobar_contents = trim(read_file('Xtest_startup_file1'))
+    local bar_contents = trim(read_file('Xtest_startup_file1~'))
 
-    eq('foobar\n', foo_contents);
-    eq('foo\n', bar_contents);
+    eq('foobar', foobar_contents);
+    eq('foo', bar_contents);
 
   end)
 end)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 3e72ba6f98..9d82ce9c0d 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -25,6 +25,7 @@ local read_file = global_helpers.read_file
 local sleep = global_helpers.sleep
 local table_flatten = global_helpers.table_flatten
 local write_file = global_helpers.write_file
+local trim = global_helpers.trim
 
 local start_dir = lfs.currentdir()
 -- XXX: NVIM_PROG takes precedence, QuickBuild sets it.
@@ -797,6 +798,7 @@ local module = {
   window = window,
   winmeths = winmeths,
   write_file = write_file,
+  trim = trim,
 }
 
 return function(after_each)
-- 
cgit