From 80ac8ec69f60f636e2d339f1f3c5c8e58774bee0 Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Mon, 3 Apr 2017 23:23:17 +0100
Subject: [PATCH] Fix tests in the 1.2.x branch

---
 test/test_history_saving.vader | 9 ++++++++-
 test/vimrc                     | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/test_history_saving.vader b/test/test_history_saving.vader
index 303a02fa..2f1044d7 100644
--- a/test/test_history_saving.vader
+++ b/test/test_history_saving.vader
@@ -1,4 +1,8 @@
 Before:
+  " Temporarily set the shell to /bin/sh, if it isn't already set that way.
+  " This will make it so the test works when running it directly.
+  let g:current_shell = &shell
+  let &shell = '/bin/sh'
   let g:history = []
   let g:ale_buffer_info = {}
   let g:ale_max_buffer_history_size = 20
@@ -16,6 +20,9 @@ Before:
   \})
 
 After:
+  " Reset the shell back to what it was before.
+  let &shell = g:current_shell
+  unlet g:current_shell
   let g:ale_history_enabled = 1
   let g:ale_history_log_output = 0
   unlet g:history
@@ -37,7 +44,7 @@ Execute(History should be set when commands are run):
 
   AssertEqual 1, len(g:history)
   AssertEqual sort(['status', 'exit_code', 'job_id', 'command']), sort(keys(g:history[0]))
-  AssertEqual ['/bin/bash', '-c', 'echo command history test'], g:history[0].command
+  AssertEqual ['/bin/sh', '-c', 'echo command history test'], g:history[0].command
   AssertEqual 'finished', g:history[0].status
   AssertEqual 0, g:history[0].exit_code
   " The Job ID will change each time, but we can check the type.
diff --git a/test/vimrc b/test/vimrc
index ef678848..57af7e15 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -7,6 +7,8 @@ set runtimepath=/home/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/testplu
 " The following is just an example
 filetype plugin indent on
 syntax on
+set shell=/bin/sh
+set shellcmdflag=-c
 set nocompatible
 set tabstop=4
 set softtabstop=4