X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/ef1c1d0655423021f60d85baa4d4cb36f862b01e..c330d0c4c20367bb15b50677d38aa50ba7bf3774:/spec/spec_helper.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 221e6ed..c6cc517 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,6 @@ require 'vimrunner' require 'vimrunner/rspec' +require 'vimrunner/server' # Explicitly enable usage of "should". RSpec.configure do |config| @@ -13,15 +14,23 @@ Vimrunner::RSpec.configure do |config| config.reuse_server = ENV['VIMRUNNER_REUSE_SERVER'] == '1' ? true : false config.start_vim do - vim = config.reuse_server ? Vimrunner.start_gvim : Vimrunner.start - plugin_path = File.expand_path('../..', __FILE__) + exe = config.reuse_server ? Vimrunner::Platform.gvim : Vimrunner::Platform.vim + vimrc = File.expand_path("../vimrc", __FILE__) + vim = Vimrunner::Server.new(:executable => exe, + :vimrc => vimrc).start + # More friendly killing. + # Otherwise profiling information might not be written. + def vim.kill + normal(':qall!') - # add_plugin appends the path to the rtp... :( - # vim.add_plugin(plugin_path, 'indent/python.vim') + Timeout.timeout(5) do + sleep 0.1 while server.running? + end + end + plugin_path = File.expand_path('../..', __FILE__) vim.command "set rtp^=#{plugin_path}" - vim.command "runtime syntax/python.vim" - vim.command "runtime indent/python.vim" + vim.command "set filetype=python" def shiftwidth @shiftwidth ||= vim.echo("exists('*shiftwidth') ? shiftwidth() : &sw").to_i