Support do/end blocks with natural assertions.

jimweirich · Dec 29, 2012 · 61be857 · 61be857
1 parent 13b19b7
commit 61be857
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/rspec/given/natural_assertion.rb b/lib/rspec/given/natural_assertion.rb
@@ -114,7 +114,8 @@ def extract_brace_block(sexp)
         unless sexp.first == :program &&
             sexp[1].first == :stmts_add &&
             sexp[1][2].first == :method_add_block &&
-            sexp[1][2][2].first == :brace_block
+            (sexp[1][2][2].first == :brace_block || sexp[1][2][2].first == :do_block)
+          puts "DBG: sexp=#{sexp.inspect}"
           source = Sorcerer.source(sexp)
           fail RSpec::Given::InvalidThenError, "Unexpected code at #{source_line}\n#{source}"
         end

diff --git a/spec/lib/rspec/given/natural_assertion_spec.rb b/spec/lib/rspec/given/natural_assertion_spec.rb
@@ -107,6 +107,16 @@
       Then { msg.should =~ /\b1 +<- +a\b/ }
     end
 
+    context "with equals assertion with do/end" do
+      Given(:block) {
+        lambda do a == 2 end
+      }
+      Then { msg.should =~ /\bexpected: +1\b/ }
+      Then { msg.should =~ /\bto equal: +2\b/ }
+      Then { msg.should =~ /\bfalse +<- +a == 2\b/ }
+      Then { msg.should =~ /\b1 +<- +a\b/ }
+    end
+
     context "with not-equals assertion" do
       Given(:block) {
         lambda { a != 1 }