summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/fixers/test_black_fixer_callback.vader13
-rw-r--r--test/test_find_references.vader6
2 files changed, 12 insertions, 7 deletions
diff --git a/test/fixers/test_black_fixer_callback.vader b/test/fixers/test_black_fixer_callback.vader
index 365b0fa6..7843783a 100644
--- a/test/fixers/test_black_fixer_callback.vader
+++ b/test/fixers/test_black_fixer_callback.vader
@@ -5,6 +5,7 @@ Before:
" Use an invalid global executable, so we don't match it.
let g:ale_python_black_executable = 'xxxinvalid'
let g:ale_python_black_options = ''
+ let g:ale_python_black_auto_pipenv = 0
call ale#test#SetDirectory('/testplugin/test/fixers')
silent cd ..
@@ -21,10 +22,6 @@ After:
call ale#test#RestoreDirectory()
Execute(The black callback should return the correct default values):
- AssertEqual
- \ 0,
- \ ale#fixers#black#Fix(bufnr(''))
-
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' -'},
@@ -37,3 +34,11 @@ Execute(The black callback should include options):
AssertEqual
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option -' },
\ ale#fixers#black#Fix(bufnr(''))
+
+Execute(Pipenv is detected when python_black_auto_pipenv is set):
+ let g:ale_python_black_auto_pipenv = 1
+ call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py')
+
+ AssertEqual
+ \ {'command': ale#Escape('pipenv') . ' run black -'},
+ \ ale#fixers#black#Fix(bufnr(''))
diff --git a/test/test_find_references.vader b/test/test_find_references.vader
index 88b2d762..14b5e37b 100644
--- a/test/test_find_references.vader
+++ b/test/test_find_references.vader
@@ -135,9 +135,9 @@ Execute(Results should be shown for tsserver responses):
AssertEqual
\ [
- \ {'filename': '/foo/bar/app.ts', 'column': 9, 'line': 9},
- \ {'filename': '/foo/bar/app.ts', 'column': 3, 'line': 804},
- \ {'filename': '/foo/bar/other/app.ts', 'column': 3, 'line': 51},
+ \ {'filename': '/foo/bar/app.ts', 'column': 9, 'line': 9, 'match': 'import {doSomething} from ''./whatever'''},
+ \ {'filename': '/foo/bar/app.ts', 'column': 3, 'line': 804, 'match': 'doSomething()'},
+ \ {'filename': '/foo/bar/other/app.ts', 'column': 3, 'line': 51, 'match': 'doSomething()'},
\ ],
\ g:item_list
AssertEqual {}, ale#references#GetMap()