merging master

1 files changed, 11 insertions, 0 deletions

diff --git a/test/fixers/test_phpcbf_fixer_callback.vader b/test/fixers/test_phpcbf_fixer_callback.vader
index 1663c89c..f7bcc2d8 100644
--- a/test/fixers/test_phpcbf_fixer_callback.vader
+++ b/test/fixers/test_phpcbf_fixer_callback.vader
@@ -5,6 +5,7 @@ Before:
 
   let g:ale_php_phpcbf_executable = 'phpcbf_test'
   let g:ale_php_phpcbf_standard = ''
+  let g:ale_php_phpcbf_options = ''
   let g:ale_php_phpcbf_use_global = 0
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
@@ -54,6 +55,15 @@ Execute(The phpcbf callback should include the phpcbf_standard option):
   \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'},
   \ ale#fixers#phpcbf#Fix(bufnr(''))
 
+Execute(User provided options should be used):
+  let g:ale_php_phpcbf_options = '--my-user-provided-option my-value'
+  call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php')
+
+  AssertEqual
+  \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . ale#Pad('--my-user-provided-option my-value') . ' -'},
+  \ ale#fixers#phpcbf#Fix(bufnr(''))
+
+
 Before:
   Save g:ale_php_phpcbf_executable
   Save g:ale_php_phpcbf_standard
@@ -61,6 +71,7 @@ Before:
 
   let g:ale_php_phpcbf_executable = 'phpcbf_test'
   let g:ale_php_phpcbf_standard = ''
+  let g:ale_php_phpcbf_options = ''
   let g:ale_php_phpcbf_use_global = 0
 
   call ale#test#SetDirectory('/testplugin/test/fixers')