summaryrefslogtreecommitdiff
path: root/test/command_callback
diff options
context:
space:
mode:
authorMichael Quinn <msquinn@google.com>2018-01-31 18:06:35 -0800
committerMichael Quinn <msquinn@google.com>2018-01-31 18:06:35 -0800
commitb13f290390ba62180f731fef6cea58d6fef8bc3e (patch)
tree65db4b84bf2a78a361a95abc5067e1c34f0040bb /test/command_callback
parentbb095df25e7fb6e3090061572bf9b1c472ac550f (diff)
downloadale-b13f290390ba62180f731fef6cea58d6fef8bc3e.zip
Update formatting and tests.
Diffstat (limited to 'test/command_callback')
-rw-r--r--test/command_callback/test_lintr_command_callback.vader16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/command_callback/test_lintr_command_callback.vader b/test/command_callback/test_lintr_command_callback.vader
index 3199b498..256618cf 100644
--- a/test/command_callback/test_lintr_command_callback.vader
+++ b/test/command_callback/test_lintr_command_callback.vader
@@ -17,18 +17,20 @@ Execute(The default lintr command should be correct):
AssertEqual
\ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e '
- \ . ale#Escape('lintr::lint(commandArgs(TRUE)[1], eval(parse(text = commandArgs(TRUE)[2])))')
- \ . ' %t '
- \ . ale#Escape('lintr::with_defaults()'),
+ \ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
+ \ . 'lint(cache = FALSE, commandArgs(TRUE),'
+ \ . 'with_defaults())')
+ \ . ' %t',
\ ale_linters#r#lintr#GetCommand(bufnr(''))
Execute(The lintr options should be configurable):
- let b:ale_r_lintr_options = 'lintr::with_defaults(object_usage_linter = NULL)'
+ let b:ale_r_lintr_options = 'with_defaults(object_usage_linter = NULL)'
AssertEqual
\ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e '
- \ . ale#Escape('lintr::lint(commandArgs(TRUE)[1], eval(parse(text = commandArgs(TRUE)[2])))')
- \ . ' %t '
- \ . ale#Escape('lintr::with_defaults(object_usage_linter = NULL)'),
+ \ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
+ \ . 'lint(cache = FALSE, commandArgs(TRUE),'
+ \ . 'with_defaults(object_usage_linter = NULL))')
+ \ . ' %t',
\ ale_linters#r#lintr#GetCommand(bufnr(''))