Common setup/cleardown

tests/breakpoints.test.vim

@@ -1,18 +1,9 @@
 function! SetUp()
-  if exists ( 'g:loaded_vimpector' )
+  call vimspector#test#setup#SetUpWithMappings( v:none )
-    unlet g:loaded_vimpector
-  endif
-
-  source vimrc
-
-  " This is a bit of a hack
-  runtime! plugin/**/*.vim
 endfunction
 
 function! ClearDown()
-  if exists( '*vimspector#internal#state#Reset' )
+  call vimspector#test#setup#ClearDown()
-    call vimspector#internal#state#Reset()
-  endif
 endfunction
 
 function! SetUp_Test_Mappings_Are_Added_HUMAN()

tests/lib/autoload/vimspector/test/setup.vim

@@ -0,0 +1,20 @@
+function! vimspector#test#setup#SetUpWithMappings( mappings )
+  if exists ( 'g:loaded_vimpector' )
+    unlet g:loaded_vimpector
+  endif
+
+  if a:mappings != v:none
+    let g:vimspector_enable_mappings = a:mappings
+  endif
+
+  source vimrc
+
+  " This is a bit of a hack
+  runtime! plugin/**/*.vim
+endfunction
+
+function! vimspector#test#setup#ClearDown()
+  if exists( '*vimspector#internal#state#Reset' )
+    call vimspector#internal#state#Reset()
+  endif
+endfunction

tests/tabpage.test.vim

@@ -1,13 +1,9 @@
 function! SetUp()
-  if exists ( 'g:loaded_vimpector' )
+  call vimspector#test#setup#SetUpWithMappings( 'HUMAN' )
-    unlet g:loaded_vimpector
+endfunction
-  endif
 
-  let g:vimspector_enable_mappings = 'HUMAN'
+function! ClearDown()
-  source vimrc
+  call vimspector#test#setup#ClearDown()
-
-  " This is a bit of a hack
-  runtime! plugin/**/*.vim
 endfunction
 
 function! Test_Step_With_Different_Tabpage()