From: has2k1 Date: Tue, 13 Aug 2013 03:47:02 +0000 (-0500) Subject: Fix failing commented out tests X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/105f8eccc98313a6c848ebf28651d77af14a1a76?ds=sidebyside;hp=-c Fix failing commented out tests Related commits --------------- - #6e60ef0 Reason ------ The indent functions, in this case GetPythonPEPIndent() can modify the cursor position. There is nothing wrong with that consequence, vim takes it into account and restores the cursor position (see References below). For the tests vim is not doing the calling, so the cursor is not restored. Solution -------- Restore the cursor position after calling the indent function. --- 105f8eccc98313a6c848ebf28651d77af14a1a76 diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb index 40269fc..932a091 100644 --- a/spec/indent/indent_spec.rb +++ b/spec/indent/indent_spec.rb @@ -30,22 +30,22 @@ describe "vim" do end end - # describe "when after a '(' that is at the end of its line" do - # before { vim.feedkeys 'itest(\' } - - # it "indents by one level" do - # proposed_indent.should == shiftwidth - # vim.feedkeys 'something' - # indent.should == shiftwidth - # vim.normal '==' - # indent.should == shiftwidth - # end - - # it "puts the closing parenthesis at the same level" do - # vim.feedkeys ')' - # indent.should == 0 - # end - # end + describe "when after a '(' that is at the end of its line" do + before { vim.feedkeys 'itest(\' } + + it "indents by one level" do + proposed_indent.should == shiftwidth + vim.feedkeys 'something' + indent.should == shiftwidth + vim.normal '==' + indent.should == shiftwidth + end + + it "puts the closing parenthesis at the same level" do + vim.feedkeys ')' + indent.should == 0 + end + end describe "when after an '(' that is followed by something" do before { vim.feedkeys 'itest(something,\' } @@ -101,7 +101,11 @@ describe "vim" do vim.echo("indent('.')").to_i end def proposed_indent - vim.echo("GetPythonPEPIndent(line('.'))").to_i + line = vim.echo("line('.')") + col = vim.echo("col('.')") + indent_value = vim.echo("GetPythonPEPIndent(line('.'))").to_i + vim.command("call cursor(#{line}, #{col})") + return indent_value end end