Let's not make testing hard: use shiftwidth() wrapper

This is also required for the old Vim on Travis!

Author: blueyed

tests/_setup.vader

@@ -0,0 +1,14 @@
+Execute (Setup):
+  " so it is clear what values later tests are working with
+  setglobal noexpandtab tabstop=8 softtabstop=0 shiftwidth=8
+
+  if exists('*shiftwidth')
+    function! Shiftwidth()
+      return shiftwidth()
+    endfunction
+  else
+    Log "WARNING: shiftwidth() not available!"
+    function! Shiftwidth()
+      return &shiftwidth
+    endfunction
+  endif

tests/config-options-are-respected.vader

@@ -1,6 +1,4 @@
-Execute (reset indent options to initial values):
-  " so it is clear what values later tests are working with
-  setglobal noexpandtab tabstop=8 softtabstop=0 shiftwidth=8
+Include: _setup.vader
 
 Execute (g:detectindent_preferred_indent is respected):
   let g:detectindent_preferred_indent = 4
@@ -9,7 +7,7 @@ Execute (g:detectindent_preferred_indent is respected):
   " expect no change in expandtab
   AssertEqual 0, &expandtab
   " shiftwidth is 8 without the option; expect a difference
-  AssertEqual 4, shiftwidth()
+  AssertEqual 4, Shiftwidth()
   bdelete
   unlet g:detectindent_preferred_indent
 
@@ -20,7 +18,7 @@ Execute (g:detectindent_min_indent is respected for space indentation):
   " expect no change in expandtab
   AssertEqual 1, &expandtab
   " shiftwidth is 2 without the option; expect a difference
-  AssertEqual 4, shiftwidth()
+  AssertEqual 4, Shiftwidth()
   bdelete
   unlet g:detectindent_min_indent
 
@@ -31,7 +29,7 @@ Execute (g:detectindent_max_indent is respected for space indentation):
   " expect no change in expandtab
   AssertEqual 1, &expandtab
   " shiftwidth is 2 without the option; expect a difference
-  AssertEqual 1, shiftwidth()
+  AssertEqual 1, Shiftwidth()
   bdelete
   unlet g:detectindent_max_indent
 
@@ -42,7 +40,7 @@ Execute (g:detectindent_max_indent is respected for mixed-space-and-tab indentat
   " expect no change in expandtab
   AssertEqual 0, &expandtab
   " shiftwidth should be 8 (though is currently 40) without the option; expect a difference
-  AssertEqual 6, shiftwidth()
+  AssertEqual 6, Shiftwidth()
   bdelete
   unlet g:detectindent_max_indent
 
@@ -57,7 +55,7 @@ Execute (g:detectindent_max_indent is ignored in favor of global options for pur
   " expect no change in expandtab
   AssertEqual 0, &expandtab
   " expect no change in shiftwidth
-  AssertEqual 8, shiftwidth()
+  AssertEqual 8, Shiftwidth()
   bdelete
   unlet g:detectindent_max_indent
 
@@ -69,7 +67,7 @@ Execute (g:detect_min_indent and max_indent, when combined, override too-low det
   tabnew tests/fixtures/jSnake-demo.html
   DetectIndent
   " shiftwidth is 2 without the two options; expect min_indent to be the deciding factor
-  AssertEqual 3, shiftwidth()
+  AssertEqual 3, Shiftwidth()
   unlet g:detectindent_min_indent
   unlet g:detectindent_max_indent
   bdelete

tests/fixtures-detected-correctly.vader

@@ -1,8 +1,4 @@
-Execute (reset indent options to initial values):
-  " so it is clear what values later tests are working with
-  setglobal noexpandtab tabstop=8 softtabstop=0 shiftwidth=8
-
-" Compatibility warning: these tests inspect `shiftwidth()`. If you get errors because your Vim is too old to have `shiftwidth()`, replace them locally with `&shiftwidth`. I use `shiftwidth()` instead of `&shiftwidth` to support possible future usage of the 0 value for 'shiftwidth', and to make the writers of language indent plugins aware of the need to migrate from checking `&sw` to checking `shiftwidth()`.
+Include: _setup.vader
 
 After:
   " close the file that was just tested and its tab, and forget about it
@@ -15,7 +11,7 @@ Execute (Coursera-The_Hardware-Software_Interface-lab1-bits.c: expandtab):
 Execute (TODO: Coursera-The_Hardware-Software_Interface-lab1-bits.c: shiftwidth):
   tabnew tests/fixtures/Coursera-The_Hardware-Software_Interface-lab1-bits.c
   DetectIndent
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (FountainMusic-FMDisplayItem.c: expandtab):
   tabnew tests/fixtures/FountainMusic-FMDisplayItem.c
@@ -24,55 +20,55 @@ Execute (FountainMusic-FMDisplayItem.c: expandtab):
 Execute (TODO: FountainMusic-FMDisplayItem.c: shiftwidth):
   tabnew tests/fixtures/FountainMusic-FMDisplayItem.c
   DetectIndent
-  AssertEqual 8, shiftwidth()
+  AssertEqual 8, Shiftwidth()
 
 Execute (FountainMusic-FMDisplayItem.h):
   tabnew tests/fixtures/FountainMusic-FMDisplayItem.h
   DetectIndent
   AssertEqual 0, &expandtab
-  AssertEqual 8, shiftwidth()
+  AssertEqual 8, Shiftwidth()
 
 Execute (GameOfLife.plaid – badly mixed indentation):
   tabnew tests/fixtures/GameOfLife.plaid
   DetectIndent
   AssertEqual 0, &expandtab
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (general-level-1.indentc):
   tabnew tests/fixtures/general-level-1.indentc
   DetectIndent
   AssertEqual 0, &expandtab
-  AssertEqual 8, shiftwidth()
+  AssertEqual 8, Shiftwidth()
 
 Execute (haml-action_view.haml):
   tabnew tests/fixtures/haml-action_view.haml
   DetectIndent
   AssertEqual 1, &expandtab
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (haml-render_layout.haml):
   tabnew tests/fixtures/haml-render_layout.haml
   DetectIndent
   AssertEqual 1, &expandtab
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (jSnake-demo.html):
   tabnew tests/fixtures/jSnake-demo.html
   DetectIndent
   AssertEqual 1, &expandtab
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (jSnake-snake3.js):
   tabnew tests/fixtures/jSnake-snake3.js
   DetectIndent
   AssertEqual 1, &expandtab
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (parslet-scope.rb):
   tabnew tests/fixtures/parslet-scope.rb
   DetectIndent
   AssertEqual 1, &expandtab
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (TODO: semver.md – no indentation at all: expandtab):
   tabnew tests/fixtures/semver.md
@@ -81,7 +77,7 @@ Execute (TODO: semver.md – no indentation at all: expandtab):
 Execute (TODO: semver.md – no indentation at all: shiftwidth):
   tabnew tests/fixtures/semver.md
   DetectIndent
-  AssertEqual 8, shiftwidth()
+  AssertEqual 8, Shiftwidth()
 
 Execute (starbuzz_beverage_cost_calculator-core.clj: expandtab):
   tabnew tests/fixtures/starbuzz_beverage_cost_calculator-core.clj
@@ -90,7 +86,7 @@ Execute (starbuzz_beverage_cost_calculator-core.clj: expandtab):
 Execute (TODO: starbuzz_beverage_cost_calculator-core.clj: shiftwidth):
   tabnew tests/fixtures/starbuzz_beverage_cost_calculator-core.clj
   DetectIndent
-  AssertEqual 2, shiftwidth()
+  AssertEqual 2, Shiftwidth()
 
 Execute (vared.fish: expandtab):
   tabnew tests/fixtures/vared.fish
@@ -99,4 +95,4 @@ Execute (vared.fish: expandtab):
 Execute (TODO: vared.fish: shiftwidth):
   tabnew tests/fixtures/vared.fish
   DetectIndent
-  AssertEqual 8, shiftwidth()
+  AssertEqual 8, Shiftwidth()