Fix burnettk#15. Support 1) convention with test dir and 2) custom path arrays

Author: burnettk

plugin/angular.vim

@@ -155,20 +155,39 @@ endfunction
 function! s:Alternate(cmd) abort
   let l:currentpath = expand('%')
   let l:possiblepathsforalternatefile = []
+
   for possiblenewpath in [s:SubStr(l:currentpath, ".js", "_test.js"), s:SubStr(l:currentpath, "_test.js", ".js")]
     if possiblenewpath != l:currentpath
-      let l:possiblepathsforalternatefile = [possiblenewpath]
+      let l:possiblepathsforalternatefile = l:possiblepathsforalternatefile + [possiblenewpath]
     endif
   endfor
 
+  " handle a test subdirectory just above the leaf node
+  let l:possiblenewpath = s:SubStr(l:currentpath, "/test/", "/")
+  if possiblenewpath != l:currentpath
+    let l:possiblepathsforalternatefile = l:possiblepathsforalternatefile + [s:SubStr(possiblenewpath, '.spec.js', '.js')]
+  else
+    let l:lastslashindex = strridx(l:currentpath, '/')
+    let l:possibletestpath = strpart(l:currentpath, 0, l:lastslashindex) . '/test' . s:SubStr(strpart(l:currentpath, l:lastslashindex), '.js', '.spec.js')
+    let l:possiblepathsforalternatefile = l:possiblepathsforalternatefile + [l:possibletestpath]
+  endif
+
   if exists('g:angular_source_directory')
-    let l:possiblesrcpaths = [g:angular_source_directory]
+    if type(g:angular_source_directory) == type([])
+      let l:possiblesrcpaths = g:angular_source_directory
+    else
+      let l:possiblesrcpaths = [g:angular_source_directory]
+    endif
   else
     let l:possiblesrcpaths = ['app/src', 'app/js', 'app/scripts', 'public/js', 'frontend/src']
   endif
 
   if exists('g:angular_test_directory')
-    let l:possibletestpaths = [g:angular_test_directory]
+    if type(g:angular_test_directory) == type([])
+      let l:possibletestpaths = g:angular_test_directory
+    else
+      let l:possibletestpaths = [g:angular_test_directory]
+    endif
   else
     let l:possibletestpaths = ['test/unit', 'test/spec', 'test/karma/unit', 'tests/frontend']
   endif

spec/alternate_spec.rb

@@ -23,6 +23,9 @@
     should_alternate_between('app/js/poo.js', 'test/spec/poo.spec.js')
     should_alternate_between('app/js/poo.js', 'test/spec/pooSpec.js')
 
+    should_alternate_between('app/foo/foo.controller.js', 'app/foo/test/foo.controller.spec.js')
+    should_alternate_between('app/bar/bar.service.js', 'app/bar/test/bar.service.spec.js')
+
     should_alternate_between('app/scripts/controllers/poo.js', 'test/spec/controllers/poo.js') # yoeman
     should_alternate_between('public/js/controllers/piles.js', 'test/karma/unit/controllers/piles.spec.js') # mean framework
     should_alternate_between('frontend/src/poo.js', 'tests/frontend/poo.spec.js') # Pull Request 6 supporting nkoehring's convention
@@ -42,7 +45,14 @@
     should_alternate_between('WebContent/js/poo.js', 'test/spec/pooSpec.js')
   end
 
-  specify "pairs that should work when test directory is configured by user" do
+  specify "with multiple src directories configured by user" do
+    assume_vimrc 'let g:angular_source_directory = ["WebContent/js", "app/src"]'
+
+    should_alternate_between('WebContent/js/poo.js', 'test/unit/poo.js')
+    should_alternate_between('app/src/poo.js', 'test/unit/pooSpec.js')
+  end
+
+  specify "pairs that should work when one test directory is configured by user" do
     assume_vimrc 'let g:angular_test_directory = "test/units"'
 
     should_alternate_between('app/js/poo.js', 'test/units/poo.js')
@@ -54,6 +64,13 @@
     should_alternate_between('app/src/poo.js', 'test/units/pooSpec.js')
   end
 
+  specify "with multiple test directories configured by user" do
+    assume_vimrc 'let g:angular_test_directory = ["test/unit", "test/spec"]'
+
+    should_alternate_between('app/js/poo.js', 'test/unit/poo.js')
+    should_alternate_between('app/src/poo.js', 'test/spec/pooSpec.js')
+  end
+
   specify "pairs should not all work" do
     file_a = 'app/junk/poo.js'
     file_b = 'test/unit/poo.js'