X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/a7617bc1e8fed5d7da31c9cba6d7075ad5f22493..a98f4de09a778473923fbc677aba6465d9d6583e:/spec/indent/indent_spec.rb

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 6f8af74..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(\<CR>' }
-
-  #   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(\<CR>' }
+
+    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,\<CR>' }
@@ -68,19 +68,19 @@ describe "vim" do
   end
 
   describe "when using simple control structures" do
-      it "indents four spaces" do
+      it "indents shiftwidth spaces" do
           vim.feedkeys 'iwhile True:\<CR>pass'
           indent.should == shiftwidth
       end
   end
 
   describe "when a line breaks with a manual '\\'" do
-    it "indents 4 spaces on normal line" do
+    it "indents shiftwidth spaces on normal line" do
         vim.feedkeys 'ivalue = test + \\\\\<CR>'
         indent.should == shiftwidth
     end
 
-    it "indents 8 spaces for control structures" do
+    it "indents 2x shiftwidth spaces for control structures" do
         vim.feedkeys 'iif somevalue == xyz and \\\\\<CR>'
         indent.should == shiftwidth * 2
     end
@@ -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