1 files changed, 28 insertions, 9 deletions
diff --git a/test/linter/test_gopls.vader b/test/linter/test_gopls.vader
index 0f1558e9..1c91fa10 100644
--- a/test/linter/test_gopls.vader
+++ b/test/linter/test_gopls.vader
@@ -1,5 +1,8 @@
 Before:
   Save g:ale_go_go111module
+  Save $GOPATH
+
+  let $GOPATH = '/non/existent/directory'
 
   call ale#assert#SetUpLinterTest('go', 'gopls')
 
@@ -14,16 +17,32 @@ After:
 
   call ale#assert#TearDownLinterTest()
 
-Execute(should set correct defaults):
+Execute(The default command should be correct):
   AssertLinter 'gopls', ale#Escape('gopls') . ' --mode stdio'
 
-Execute(should configure gopls callback executable):
+Execute(The executable should be configurable):
   let b:ale_go_gopls_executable = 'boo'
-  let b:ale_go_gopls_options = ''
 
-  AssertLinter 'boo', ale#Escape('boo')
+  AssertLinter 'boo', ale#Escape('boo') . ' --mode stdio'
+
+Execute(gopls should be found in GOPATH):
+  " This is a directory with a fake executable
+  let $GOPATH = ale#test#GetFilename('../test-files/go/gopath')
+
+  AssertLinter
+  \ ale#test#GetFilename('../test-files/go/gopath/bin/gopls'),
+  \ ale#Escape(ale#test#GetFilename('../test-files/go/gopath/bin/gopls'))
+  \   . ' --mode stdio'
+
+Execute(Global settings should be preferre for gopls if use_global = 1):
+  " This is a directory with a fake executable
+  let $GOPATH = ale#test#GetFilename('../test-files/go/gopath')
+  let b:ale_go_gopls_executable = 'boo'
+  let b:ale_go_gopls_use_global = 1
+
+  AssertLinter 'boo', ale#Escape('boo') . ' --mode stdio'
 
-Execute(should set gopls options):
+Execute(Settings options should work):
   call ale#test#SetFilename('../test-files/go/go1/prj1/file.go')
   " let b:ale_completion_enabled = 1
   let b:ale_go_gopls_options = ''
@@ -39,18 +58,18 @@ Execute(should set gopls options):
   let b:ale_go_gopls_init_options = {'ui.diagnostic.analyses': {'composites': v:false}}
   AssertLSPOptions {'ui.diagnostic.analyses': {'composites': v:false}}
 
-Execute(should support go environment variables):
+Execute(Go environment variables should be passed on):
   let b:ale_go_go111module = 'off'
 
   AssertLinter 'gopls',
   \ ale#Env('GO111MODULE', 'off') . ale#Escape('gopls') . ' --mode stdio'
 
-Execute(Should return directory for 'go.mod' if found in parent directory):
+Execute(Project directories should be detected based on 'go.mod' being present):
   call ale#test#SetFilename('../test-files/go/test.go')
 
   AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/go')
 
-Execute(Should return nearest directory with '.git' if found in parent directory):
+Execute(Project directories with .git should be detected):
   call ale#test#SetFilename('test.go')
 
   if !isdirectory(g:dir . '/.git')
@@ -59,7 +78,7 @@ Execute(Should return nearest directory with '.git' if found in parent directory
 
   AssertLSPProject g:dir
 
-Execute(Should ignore 'go.mod' and return '.git' dir if modules off):
+Execute('go.mod' should be ignored if modules are off):
   call ale#test#SetFilename('../test-files/go/test.go')
 
   let b:ale_go_go111module = 'off'