diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | spec/loading_spec.rb | 6 | ||||
| -rwxr-xr-x | spec/spec_helper.rb | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 92020c6c..78f7ea97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,5 @@ addons: packages: - vim-gtk before_script: - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" -script: bundle exec rspec --format=documentation + - "./build" +script: xvfb-run bundle exec rspec --format=documentation diff --git a/spec/loading_spec.rb b/spec/loading_spec.rb index 4d78f531..e9e1f3b8 100644 --- a/spec/loading_spec.rb +++ b/spec/loading_spec.rb @@ -9,7 +9,7 @@ describe "My Vim plugin" do extensions = extensions.split(/[\n,]/) - extensions.each do |ext| + extensions.sort!.uniq!.each do |ext| if ext.match?(/^[a-z\.]+$/i) it "should parse #{ext} file" do Timeout::timeout(20) do @@ -21,4 +21,8 @@ describe "My Vim plugin" do end end end + + after(:all) do + vim.kill + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5b8e5ace..21ab43cc 100755 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,7 @@ require 'vimrunner/rspec' $plugin_path = File.expand_path('../..', __FILE__) Vimrunner::RSpec.configure do |config| - config.reuse_server = true + config.reuse_server = false # Decide how to start a Vim instance. In this block, an instance should be # spawned and set up with anything project-specific. |