diff --git a/home/programs/neovim/configuration/ftdetect/folder_reuter.vim b/home/programs/neovim/configuration/ftdetect/folder_reuter.vim index e854c6e..d1ba88c 100644 --- a/home/programs/neovim/configuration/ftdetect/folder_reuter.vim +++ b/home/programs/neovim/configuration/ftdetect/folder_reuter.vim @@ -3,26 +3,12 @@ augroup reuterFolder autocmd BufEnter **/microservices/cms/**/*.js :setlocal tabstop=2 shiftwidth=2 autocmd BufEnter **/reuter/**/Unit/** execute "call ReuterSetupPhpUnitUnit()" - autocmd BufEnter **/reuter/**/Functional/** execute "call ReuterSetupPhpUnitFunctional()" autocmd BufEnter **/reuter/**/.git/COMMIT_EDITMSG let b:ale_gitcommit_gitlint_options = '-c general.contrib=contrib-title-conventional-commits' augroup END -" As long as we use older phpunit which does not provider proper testdox output -function! ReuterSetupPhpUnitUnit() - let g:test#php#phpunit#options = { - \ 'file': '--testdox ', - \ 'nearest': '--testdox', - \} -endfunction - function! ReuterSetupPhpUnitFunctional() - let g:test#php#phpunit#options = { - \ 'file': '--testdox', - \ 'nearest': '--testdox', - \} " let g:test#php#phpunit#options = { - " \ 'file': '--stop-on-error --stop-on-failure --testdox', - " \ 'nearest': '--testdox', + " \ 'file': '--stop-on-error --stop-on-failure', " \} endfunction diff --git a/home/programs/neovim/configuration/ftdetect/folder_sac.vim b/home/programs/neovim/configuration/ftdetect/folder_sac.vim index 8d9d48c..e6c8e9b 100644 --- a/home/programs/neovim/configuration/ftdetect/folder_sac.vim +++ b/home/programs/neovim/configuration/ftdetect/folder_sac.vim @@ -9,14 +9,14 @@ augroup END function! SacSetupPhpUnitUnit() let g:test#php#phpunit#options = { - \ 'file': '--configuration phpunit.unit.xml.dist --testdox', - \ 'nearest': '--configuration phpunit.unit.xml.dist --testdox', + \ 'file': '--configuration phpunit.unit.xml.dist', + \ 'nearest': '--configuration phpunit.unit.xml.dist', \} endfunction function! SacSetupPhpUnitFunctional() let g:test#php#phpunit#options = { - \ 'file': '--configuration phpunit.functional.xml.dist --testdox', - \ 'nearest': '--configuration phpunit.functional.xml.dist --testdox', + \ 'file': '--configuration phpunit.functional.xml.dist', + \ 'nearest': '--configuration phpunit.functional.xml.dist', \} endfunction diff --git a/home/programs/neovim/plugins/test.vim b/home/programs/neovim/plugins/test.vim index d98b505..18bb0d8 100644 --- a/home/programs/neovim/plugins/test.vim +++ b/home/programs/neovim/plugins/test.vim @@ -13,11 +13,6 @@ let g:test#php#codeception#options = { \ 'file': '--env production --debug', \} -let g:test#php#phpunit#options = { - \ 'nearest': '--testdox', - \ 'file': '--testdox', -\} - if !exists('g:test#php#codeception#suite') let g:test#php#codeception#suite = 'acceptance' endif diff --git a/projects/sac/hutnews-shell.nix b/projects/sac/hutnews-shell.nix index e78ab03..9b3395d 100644 Binary files a/projects/sac/hutnews-shell.nix and b/projects/sac/hutnews-shell.nix differ