Merge pull request #16 from has2k1/commented-out-tests

[etc/vim.git] / spec / indent / indent_spec.rb

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index c3488f3c3f23f71d100e55fed0b4edf5454a9a28..932a09153631d7fa5f401d1d06d4267c02ef4ffd 100644 (file)
--- 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>' }
@@ -67,6 +67,30 @@ describe "vim" do
     end
   end
 
+  describe "when using simple control structures" 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 shiftwidth spaces on normal line" do
+        vim.feedkeys 'ivalue = test + \\\\\<CR>'
+        indent.should == shiftwidth
+    end
+
+    it "indents 2x shiftwidth spaces for control structures" do
+        vim.feedkeys 'iif somevalue == xyz and \\\\\<CR>'
+        indent.should == shiftwidth * 2
+    end
+
+    it "indents relative to line above" do
+        vim.feedkeys 'i\tvalue = test + \\\\\<CR>'
+        indent.should == shiftwidth * 2
+    end
+  end
+
   def shiftwidth
     @shiftwidth ||= vim.echo("exists('*shiftwidth') ? shiftwidth() : &sw").to_i
   end
@@ -77,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