Close #2281 - Separate cwd commands from commands

Working directories are now set seperately from the commands so they
can later be swapped out when running linters over projects is
supported, and also better support filename mapping for running linters
on other machines in future.

1 files changed, 12 insertions, 12 deletions

diff --git a/test/command_callback/test_elm_make_command_callback.vader b/test/command_callback/test_elm_make_command_callback.vader
index 7ad439f9..97a9e91d 100644
--- a/test/command_callback/test_elm_make_command_callback.vader
+++ b/test/command_callback/test_elm_make_command_callback.vader
@@ -11,18 +11,18 @@ Execute(should get valid executable with default params):
 
   let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp')
   AssertLinter g:executable,
-  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
-  \ . ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
+  \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
 
 Execute(should get elm-test executable for test code with elm >= 0.19):
   call ale#test#SetFilename('../elm-test-files/newapp/tests/TestSuite.elm')
 
   let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm-test')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp')
   AssertLinter g:executable,
-  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
-  \ . ale#Escape(g:executable) . ' make --report=json --output=/dev/null --compiler '
+  \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null --compiler '
   \ . ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm') . ' %t'
 
 Execute(should fallback to elm executable with elm >= 0.19):
@@ -30,27 +30,27 @@ Execute(should fallback to elm executable with elm >= 0.19):
 
   let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp-notests/node_modules/.bin/elm')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp-notests')
   AssertLinter g:executable,
-  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp-notests')) . ' && '
-  \ . ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
+  \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
 
 Execute(should get plain elm executable for test code with elm < 0.19):
   call ale#test#SetFilename('../elm-test-files/oldapp/tests/TestSuite.elm')
 
   let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/oldapp/node_modules/.bin/elm')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/oldapp')
   AssertLinter g:executable,
-  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/oldapp')) . ' && '
-  \ . ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
+  \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
 
 Execute(should get valid executable with 'use_global' params):
   let g:ale_elm_make_use_global = 1
 
   call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp')
   AssertLinter 'elm',
-  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
-  \ . ale#Escape('elm') . ' make --report=json --output=/dev/null %t'
+  \ ale#Escape('elm') . ' make --report=json --output=/dev/null %t'
 
 Execute(should get valid executable with 'use_global' and 'executable' params):
   let g:ale_elm_make_executable = 'other-elm'
@@ -58,6 +58,6 @@ Execute(should get valid executable with 'use_global' and 'executable' params):
 
   call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp')
   AssertLinter 'other-elm',
-  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
-  \ . ale#Escape('other-elm') . ' make --report=json --output=/dev/null %t'
+  \ ale#Escape('other-elm') . ' make --report=json --output=/dev/null %t'