Merge pull request #26 from dantesun/master

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

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index cd79e3681d2b12193cd5d533ca1994d8ec00f30d..15e265ade29061abfc642ada4e134a104e0b1be8 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -199,7 +199,7 @@ shared_examples_for "vim" do
   end
 
   describe "when current line is dedented compared to previous line" do
   end
 
   describe "when current line is dedented compared to previous line" do

-     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>return True\<CR>\<ESC>' }
+     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>y = True\<CR>\<ESC>' }

      it "and current line has a valid indentation (Part 1)" do
         vim.feedkeys '0i\<TAB>if y:'
         proposed_indent.should == -1
      it "and current line has a valid indentation (Part 1)" do
         vim.feedkeys '0i\<TAB>if y:'
         proposed_indent.should == -1


@@ -216,6 +216,14 @@ shared_examples_for "vim" do
      end
   end
 
      end
   end
 

+  describe "when current line is dedented compared to the last non-empty line" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>y = True\<CR>\<CR>\<ESC>' }
+     it "and current line has a valid indentation" do
+        vim.feedkeys '0i\<TAB>if y:'
+        proposed_indent.should == -1
+     end
+  end
+

   describe "when an 'if' is followed by" do
      before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>' }
      it "an elif, it lines up with the 'if'" do
   describe "when an 'if' is followed by" do
      before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>' }
      it "an elif, it lines up with the 'if'" do