From: Hynek Schlawack Date: Sun, 27 Oct 2013 18:03:58 +0000 (-0700) Subject: Merge pull request #16 from has2k1/commented-out-tests X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/a98f4de09a778473923fbc677aba6465d9d6583e?hp=a94e8a584f2c923ed438c0e616a8acdef70554a8 Merge pull request #16 from has2k1/commented-out-tests Fix failing commented out tests --- 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