diff --git a/vim/snippets/ruby/rspec.snip b/vim/snippets/ruby/rspec.snip index 9439d2c8f4..11e82d5f24 100644 --- a/vim/snippets/ruby/rspec.snip +++ b/vim/snippets/ruby/rspec.snip @@ -7,7 +7,7 @@ snippet des describe '${1:description}' do ${2} end -snippet desc +snippet descc describe ${1:class} do it '${2}' do ${3} @@ -32,13 +32,13 @@ snippet cont end # before & after -snippet before- - before(:${1:each}) do - ${2} +snippet bef + before(:each) do + ${1} end -snippet after- - after(:${1:each}) do - ${2} +snippet aft + after(:each) do + ${1} end # it should @@ -56,8 +56,8 @@ snippet itshbe end # matchers -snippet sheq - expect(${1:target}).to == ${2} -snippet shbe +snippet exeq + expect(${1:target}).to eq(${2}) +snippet exbe expect(${1:target}).to be_${2:result} diff --git a/vimrc.options b/vimrc.options index 9b64fa24e7..b7aed67871 100644 --- a/vimrc.options +++ b/vimrc.options @@ -39,6 +39,9 @@ " AutoComplPop like behavior. let g:neocomplcache_enable_auto_select = 0 + " Force autocomplete over Rails.vim + let g:neocomplcache#force_overwrite_completefunc = 1 + " Recommended key-mappings. " : completion. inoremap pumvisible() ? "\" : "\"