From 240dc9cbb68f84b4a99736abc09a4c70d728f42e Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Fri, 29 May 2015 01:07:31 +0900
Subject: [PATCH] Fix Travis CI build

---
 test/regressions.vader |  4 ++--
 test/test.vader        | 23 ++++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/test/regressions.vader b/test/regressions.vader
index 4280ec8..46fb00e 100644
--- a/test/regressions.vader
+++ b/test/regressions.vader
@@ -66,14 +66,14 @@ Execute (#130 Proper cleanup of on-demand loading triggers):
 
 **********************************************************************
 Execute (#131 Syntax error):
-  call plug#begin('/no-permission')
+  call plug#begin('/proc/no-permission')
   Plug 'junegunn/vim-emoji'
   call plug#end()
 
   redir => out
   silent PlugInstall
   redir END
-  Assert out =~ 'Invalid plug directory: /no-permission'
+  Assert out =~ 'Invalid plug directory: /proc/no-permission', out
 
 **********************************************************************
 Execute (#139-1 Using new remote branch):
diff --git a/test/test.vader b/test/test.vader
index 9021083..03de700 100644
--- a/test/test.vader
+++ b/test/test.vader
@@ -11,6 +11,11 @@ Execute (Initialize test environment):
     let $PLUG_SRC = globpath(&rtp, 'autoload/plug.vim')
   endif
 
+  " Temporarily patch plug.vim
+  call system('cp $PLUG_SRC $PLUG_SRC.org')
+  call writefile(extend(readfile($PLUG_SRC),
+  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction']), $PLUG_SRC)
+
   set t_Co=256
   colo default
   pclose
@@ -40,22 +45,13 @@ Execute (Initialize test environment):
     call system(printf('rm -rf "%s"', a:file))
   endfunction
 
-  " Reload vim-plug to reset s:-variables
   function! ReloadPlug()
-    let tmpdir = tempname()
-    let tmp = tmpdir.'/plug.vim'
-    call mkdir(tmpdir, 'p')
-    try
-      call writefile(readfile($PLUG_SRC), tmp)
-      unlet! g:loaded_plug
-      execute 'source' tmp
-      let &rtp = g:base_rtp
-    finally
-      call RmRf(tmpdir)
-    endtry
+    call ResetPlug()
+    source $PLUG_SRC
+    let &rtp = g:base_rtp
   endfunction
 
-  call ReloadPlug()
+  source $PLUG_SRC
 
 Execute (Print Interpreter Version):
   redir => out
@@ -84,6 +80,7 @@ Execute (Cleanup):
   silent! delc AssertExpect
   silent! unmap /
   silent! unmap ?
+  call system('mv $PLUG_SRC.org $PLUG_SRC')
 
   Restore