diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2017-12-16 16:29:33 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-12-17 16:09:18 +0100 |
| commit | 5b692124cc94c8e5edc0c767e6a71887754643cd (patch) | |
| tree | 852bda2d3c4c9517391e31d083a86c0fda27db5c | |
| parent | a1adfdc7d59979824addce2f519a527f9a5c0290 (diff) | |
| download | rneovim-5b692124cc94c8e5edc0c767e6a71887754643cd.tar.gz rneovim-5b692124cc94c8e5edc0c767e6a71887754643cd.tar.bz2 rneovim-5b692124cc94c8e5edc0c767e6a71887754643cd.zip | |
test: remove inspect test; set NODE_PATH in nodejs_spec.lua
provider#node#can_inspect will fail on some systems because it is common
to have old node versions in OS (any Linux OS that has LTS releases)
and CI (Travis, Appveyor).
NODE_PATH can be trivially set with VimL.
Build scripts don't have to set it for the nodejs tests to work.
NODE_PATH is optional to begin with and is used only as a workaround
for the neovim node.js host.
| -rw-r--r-- | ci/build.bat | 3 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 1 | ||||
| -rw-r--r-- | test/functional/provider/nodejs_spec.lua | 9 |
3 files changed, 1 insertions, 12 deletions
diff --git a/ci/build.bat b/ci/build.bat index c5353ec5d1..9909d102a4 100644 --- a/ci/build.bat +++ b/ci/build.bat @@ -39,9 +39,6 @@ where.exe neovim-ruby-host.bat || goto :error cmd /c npm.cmd install -g neovim || goto :error where.exe neovim-node-host.cmd || goto :error -for /f %%F in ('cmd /c npm root -g') do ( - set NODE_PATH=%%F -) mkdir .deps cd .deps diff --git a/ci/run_tests.sh b/ci/run_tests.sh index ee3fa4a5af..a0bf6e010d 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -23,7 +23,6 @@ if test "$CLANG_SANITIZER" != "TSAN" ; then # Additional threads are only created when the builtin UI starts, which # doesn't happen in the unit/functional tests run_test run_unittests - export NODE_PATH="$(npm root -g)" run_test run_functionaltests fi run_test run_oldtests diff --git a/test/functional/provider/nodejs_spec.lua b/test/functional/provider/nodejs_spec.lua index 9423243607..ef563dd0b0 100644 --- a/test/functional/provider/nodejs_spec.lua +++ b/test/functional/provider/nodejs_spec.lua @@ -4,8 +4,6 @@ local missing_provider = helpers.missing_provider local command = helpers.command local write_file = helpers.write_file local eval = helpers.eval -local sleep = helpers.sleep -local funcs = helpers.funcs local retry = helpers.retry do @@ -20,12 +18,7 @@ end before_each(function() clear() -end) - -describe('nodejs', function() - it('can inspect', function() - eq(1, funcs['provider#node#can_inspect']()) - end) + command([[let $NODE_PATH = get(split(system('npm root -g'), "\n"), 0, '')]]) end) describe('nodejs host', function() |