Merge pull request #19 from kljohann/tests

Run test cases for different sets of settings

While we care only about 4 spaces, running it with both may uncover subtle bugs.

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 21d14b7d9f30523f03c0dac8ecbb5a1c666ce47b..eb3c8a6feb44669f2f9b19a54a7d185939427a78 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "vim" do
+shared_examples_for "vim" do
 
   before(:each) { vim.normal 'gg"_dG' }  # clear buffer
 
@@ -100,7 +100,7 @@ describe "vim" do
     end
 
     it "indents relative to line above" do
-        vim.feedkeys 'i\tvalue = test + \\\\\<CR>'
+        vim.feedkeys 'i\<TAB>value = test + \\\\\<CR>'
         indent.should == shiftwidth * 2
     end
   end
@@ -145,3 +145,18 @@ describe "vim" do
   end
 end
 
+describe "vim when using width of 4" do
+  before {
+    vim.command("set sw=4 ts=4 sts=4 et")
+  }
+
+  it_behaves_like "vim"
+end
+
+describe "vim when using width of 8" do
+  before {
+    vim.command("set sw=8 ts=8 sts=8 et")
+  }
+
+  it_behaves_like "vim"
+end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3a07436c6a3fd280b25384bfc0f45916d5f6c1d5..b1e82a123e7bdbb3a2665ffc4ea69feb17bcf276 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,8 @@ require 'vimrunner'
 require 'vimrunner/rspec'
 
 Vimrunner::RSpec.configure do |config|
-  config.reuse_server = true
+  # FIXME: reuse_server = true seems to hang after a certain number of test cases
+  config.reuse_server = false
 
   config.start_vim do
     vim = Vimrunner.start