Merge pull request #2176 from altaurog/feat/elm-tests

support tests/ with elm 0.19.0

14 files changed, 37 insertions, 7 deletions

diff --git a/test/command_callback/test_elm_make_command_callback.vader b/test/command_callback/test_elm_make_command_callback.vader
index 6d95676f..02b2d76c 100644
--- a/test/command_callback/test_elm_make_command_callback.vader
+++ b/test/command_callback/test_elm_make_command_callback.vader
@@ -7,26 +7,56 @@ After:
   call ale#assert#TearDownLinterTest()
 
 Execute(should get valid executable with default params):
-  call ale#test#SetFilename('../elm-test-files/app/testfile.elm')
+  call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm')
 
-  let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/app/node_modules/.bin/elm')
+  let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm')
 
   AssertLinter g:executable,
-  \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t'
+  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
+  \ . 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')
+
+  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'
+
+Execute(should fallback to elm executable with elm >= 0.19):
+  call ale#test#SetFilename('../elm-test-files/newapp-notests/tests/TestMain.elm')
+
+  let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp-notests/node_modules/.bin/elm')
+
+  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'
+
+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')
+
+  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'
 
 Execute(should get valid executable with 'use_global' params):
   let g:ale_elm_make_use_global = 1
 
-  call ale#test#SetFilename('../elm-test-files/app/testfile.elm')
+  call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm')
 
   AssertLinter 'elm',
-  \ ale#Escape('elm') . ' make --report=json --output=/dev/null %t'
+  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
+  \ . 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'
   let g:ale_elm_make_use_global = 1
 
-  call ale#test#SetFilename('../elm-test-files/app/testfile.elm')
+  call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm')
 
   AssertLinter 'other-elm',
-  \ ale#Escape('other-elm') . ' make --report=json --output=/dev/null %t'
+  \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/newapp')) . ' && '
+  \ . ale#Escape('other-elm') . ' make --report=json --output=/dev/null %t'
diff --git a/test/elm-test-files/app/filetest.elm b/test/elm-test-files/newapp-notests/elm.json
index e69de29b..e69de29b 100644
--- a/test/elm-test-files/app/filetest.elm
+++ b/test/elm-test-files/newapp-notests/elm.json
diff --git a/test/elm-test-files/app/node_modules/.bin/elm b/test/elm-test-files/newapp-notests/node_modules/.bin/elm
index e69de29b..e69de29b 100644
--- a/test/elm-test-files/app/node_modules/.bin/elm
+++ b/test/elm-test-files/newapp-notests/node_modules/.bin/elm
diff --git a/test/elm-test-files/newapp-notests/tests/TestMain.elm b/test/elm-test-files/newapp-notests/tests/TestMain.elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/newapp-notests/tests/TestMain.elm
diff --git a/test/elm-test-files/newapp/elm.json b/test/elm-test-files/newapp/elm.json
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/newapp/elm.json
diff --git a/test/elm-test-files/newapp/node_modules/.bin/elm b/test/elm-test-files/newapp/node_modules/.bin/elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/newapp/node_modules/.bin/elm
diff --git a/test/elm-test-files/newapp/node_modules/.bin/elm-test b/test/elm-test-files/newapp/node_modules/.bin/elm-test
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/newapp/node_modules/.bin/elm-test
diff --git a/test/elm-test-files/newapp/src/Main.elm b/test/elm-test-files/newapp/src/Main.elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/newapp/src/Main.elm
diff --git a/test/elm-test-files/newapp/tests/TestSuite.elm b/test/elm-test-files/newapp/tests/TestSuite.elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/newapp/tests/TestSuite.elm
diff --git a/test/elm-test-files/oldapp/elm-package.json b/test/elm-test-files/oldapp/elm-package.json
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/oldapp/elm-package.json
diff --git a/test/elm-test-files/oldapp/node_modules/.bin/elm b/test/elm-test-files/oldapp/node_modules/.bin/elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/oldapp/node_modules/.bin/elm
diff --git a/test/elm-test-files/oldapp/node_modules/.bin/elm-test b/test/elm-test-files/oldapp/node_modules/.bin/elm-test
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/oldapp/node_modules/.bin/elm-test
diff --git a/test/elm-test-files/oldapp/src/Main.elm b/test/elm-test-files/oldapp/src/Main.elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/oldapp/src/Main.elm
diff --git a/test/elm-test-files/oldapp/tests/TestSuite.elm b/test/elm-test-files/oldapp/tests/TestSuite.elm
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/elm-test-files/oldapp/tests/TestSuite.elm