Permalink
Browse files

Merge

  • Loading branch information...
1 parent a82015c commit c6b5e623a9193d8c595583dc1bf26b8516b8798a @lambdalisue committed May 16, 2016
View
@@ -26,7 +26,7 @@ before_script:
- git clone --depth 1 https://github.com/vim-jp/vital.vim /tmp/vital
- git clone --depth 1 https://github.com/syngan/vim-vimlint /tmp/vim-vimlint
- git clone --depth 1 https://github.com/ynkdir/vim-vimlparser /tmp/vim-vimlparser
- - git clone --branch v1.5.1 --depth 1 https://github.com/thinca/vim-themis /tmp/vim-themis
+ - git clone --depth 1 https://github.com/thinca/vim-themis /tmp/vim-themis
- (cd /tmp/vimproc && make)
script:
View
@@ -19,7 +19,7 @@ install:
$Env:THEMIS_VIM = $vim + (Get-ChildItem $vim).Name + '\vim.exe'
- 'git clone --depth 1 https://github.com/vim-jp/vital.vim %TEMP%\vital'
- - 'git clone --depth 1 --branch v1.5.1 https://github.com/thinca/vim-themis %TEMP%\vim-themis'
+ - 'git clone --depth 1 https://github.com/thinca/vim-themis %TEMP%\vim-themis'
- 'git clone --depth 1 --branch ver.9.2 https://github.com/Shougo/vimproc.vim %TEMP%\vimproc'
- 'appveyor DownloadFile https://github.com/Shougo/vimproc.vim/releases/download/ver.9.2/vimproc_win64.dll -FileName %TEMP%\vimproc\lib\vimproc_win64.dll'
@@ -5,18 +5,21 @@ Describe gita#command#add
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
- let guard = Guard.store(['g:gita#process#options'])
+ " the line below is required to load requirements before :redir
+ silent Gita add
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/command/add.vim')
\)
+ let guard = Guard.store(['g:gita#process#options'])
let g:gita#process#options = {
\ 'clients': [deepcopy(V.import('System.Process.Mock'))],
\}
- " the line below is required to load requirements before :redir
- silent Gita add
End
- After all
+ After
call guard.restore()
End
@@ -5,18 +5,21 @@ Describe gita#command#init
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
- let guard = Guard.store(['g:gita#process#options'])
+ " the line below is required to load requirements before :redir
+ silent Gita init
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/command/init.vim')
\)
+ let guard = Guard.store(['g:gita#process#options'])
let g:gita#process#options = {
\ 'clients': [deepcopy(V.import('System.Process.Mock'))],
\}
- " the line below is required to load requirements before :redir
- silent Gita init
End
- After all
+ After
call guard.restore()
End
@@ -4,18 +4,21 @@ Describe gita#command#merge
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
- let guard = Guard.store(['g:gita#process#options'])
+ " the line below is required to load requirements before :redir
+ silent Gita merge
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/command/merge.vim')
\)
+ let guard = Guard.store(['g:gita#process#options'])
let g:gita#process#options = {
\ 'clients': [deepcopy(V.import('System.Process.Mock'))],
\}
- " the line below is required to load requirements before :redir
- silent Gita merge
End
- After all
+ After
call guard.restore()
End
@@ -4,18 +4,21 @@ Describe gita#command#rebase
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
- let guard = Guard.store(['g:gita#process#options'])
+ " the line below is required to load requirements before :redir
+ silent Gita rebase
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/command/rebase.vim')
\)
+ let guard = Guard.store(['g:gita#process#options'])
let g:gita#process#options = {
\ 'clients': [deepcopy(V.import('System.Process.Mock'))],
\}
- " the line below is required to load requirements before :redir
- silent Gita rebase
End
- After all
+ After
call guard.restore()
End
@@ -4,18 +4,21 @@ Describe gita#command#reset
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
- let guard = Guard.store(['g:gita#process#options'])
+ " the line below is required to load requirements before :redir
+ silent Gita reset
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/command/reset.vim')
\)
+ let guard = Guard.store(['g:gita#process#options'])
let g:gita#process#options = {
\ 'clients': [deepcopy(V.import('System.Process.Mock'))],
\}
- " the line below is required to load requirements before :redir
- silent Gita reset
End
- After all
+ After
call guard.restore()
End
@@ -5,18 +5,21 @@ Describe gita#command#rm
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
- let guard = Guard.store(['g:gita#process#options'])
+ " the line below is required to load requirements before :redir
+ silent Gita rm
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/command/rm.vim')
\)
+ let guard = Guard.store(['g:gita#process#options'])
let g:gita#process#options = {
\ 'clients': [deepcopy(V.import('System.Process.Mock'))],
\}
- " the line below is required to load requirements before :redir
- silent Gita rm
End
- After all
+ After
call guard.restore()
End
@@ -6,24 +6,23 @@ Describe gita#content#show
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
let ProcessMock = V.import('System.Process.Mock')
- let guard = Guard.store(['g:gita#process#options'])
+ End
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/content/show.vim')
\)
- End
-
- After all
- call guard.restore()
- End
-
- Before
+ let guard = Guard.store(['g:gita#process#options'])
let mock = deepcopy(ProcessMock)
let g:gita#process#options = {
\ 'clients': [mock],
\}
End
+ After
+ call guard.restore()
+ End
+
Describe s:replace_filenames_in_diff({content}, {filename1}, {filename2}, {repl})
Context substitute test
It is possible to substitute C:\Windows\Test.txt
@@ -4,10 +4,7 @@ Describe gita#core
let Path = V.import('System.Filepath')
let Guard = V.import('Vim.Guard')
let ScriptLocal = V.import('Vim.ScriptLocal')
-
let scriptfile = Path.realpath('autoload/gita/core.vim')
- let sf = ScriptLocal.sfuncs(scriptfile)
- let sv = ScriptLocal.svars(scriptfile)
" Create a mock Git working tree
let root = tempname()
@@ -32,6 +29,8 @@ Describe gita#core
End
Before
+ let sf = ScriptLocal.sfuncs(scriptfile)
+ let sv = ScriptLocal.svars(scriptfile)
let guard = Guard.store([['references', sv]])
let saved_getcwd = getcwd()
execute printf('cd %s', fnameescape(root))
@@ -3,6 +3,9 @@ Describe gita#process
let V = vital#of('vital')
let Path = V.import('System.Filepath')
let ScriptLocal = V.import('Vim.ScriptLocal')
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(Path.realpath('autoload/gita/process.vim'))
End
@@ -3,6 +3,9 @@ Describe gita#util#formatter
let V = vital#of('vital')
let Path = V.import('System.Filepath')
let ScriptLocal = V.import('Vim.ScriptLocal')
+ End
+
+ Before
let sf = ScriptLocal.sfuncs(
\ Path.realpath('autoload/gita/util/formatter.vim')
\)
@@ -4,9 +4,6 @@ Describe Git
let Path = V.import('System.Filepath')
let ScriptLocal = V.import('Vim.ScriptLocal')
let Git = V.import('Git')
- let sf = ScriptLocal.sfuncs(
- \ Path.realpath('autoload/vital/__gita__/Git.vim')
- \)
" Create a mock Git working tree
let root = tempname()
let worktree = Path.join(root, 'i n s i d e')
@@ -29,6 +26,12 @@ Describe Git
call File.rmdir(root, 'r')
End
+ Before
+ let sf = ScriptLocal.sfuncs(
+ \ Path.realpath('autoload/vital/__gita__/Git.vim')
+ \)
+ End
+
After
call Git.clear()
End
@@ -4,9 +4,6 @@ Describe Git.Process
let Path = V.import('System.Filepath')
let ScriptLocal = V.import('Vim.ScriptLocal')
let GitProcess = V.import('Git.Process')
- let sf = ScriptLocal.sfuncs(
- \ Path.realpath('autoload/vital/__gita__/Git/Process.vim')
- \)
" Create a mock Git working tree
let root = tempname()
@@ -25,6 +22,12 @@ Describe Git.Process
call File.rmdir(root, 'r')
End
+ Before
+ let sf = ScriptLocal.sfuncs(
+ \ Path.realpath('autoload/vital/__gita__/Git/Process.vim')
+ \)
+ End
+
Describe .get_config()
It returns a copy of a config dictionary
let config = GitProcess.get_config()

0 comments on commit c6b5e62

Please sign in to comment.