Test: Fix vader_setup dep from 946

test/commentstring.vader

@@ -1,4 +1,13 @@
-Include: vader_includes/vader_setup.vader
+# Test comment string PR #946
+# TODO try default 
+# TODO try editing other buffer
+#Execute (default commenstring, ft vimwiki):
+#  AssertEqual &filetype[0], 't'
+#  AssertEqual '/*%s*/', &commentstring
+
+
+Given txt (txt):
+  txt
 
 After (clean up):
   if exists('g:vimwiki_commentstring')
@@ -8,22 +17,16 @@ After (clean up):
     unlet b:did_ftplugin
   endif
 
-Execute (default commentstring):
-  AssertEqual '/*%s*/', &commentstring
-
-Execute (default commenstring, ft vimwiki):
-  let g:vimwiki_commentstring=""
-  set ft=vimwiki
-  AssertEqual '/*%s*/', &commentstring
-
 Execute (default vimwiki commentstring):
+  call vimwiki#vars#init()
   set ft=vimwiki
   AssertEqual '%%%s', &commentstring
 
 Execute (html commentstring):
   let g:vimwiki_commentstring='<!-- %s -->'
+  call vimwiki#vars#init()
   set ft=vimwiki
   AssertEqual '<!-- %s -->', &commentstring
 
-Include: vader_includes/vader_teardown.vader
-
+Expect (void):
+  txt