rspec-example_steps 0.1.2 → 0.2.0

data/lib/rspec/example_steps/documentation_formatter.rb

@@ -43,6 +43,11 @@ module RSpec
 
           output.puts yellow(full_message)
         end
+
+        def example_step_failed(example_group, type, message, options)
+          full_message = "#{current_indentation}  #{type.to_s.capitalize} #{message} (FAILED)"
+          output.puts red(full_message)
+        end
       end
     end
   end

data/lib/rspec/example_steps/example_group.rb

@@ -11,7 +11,12 @@ module RSpec
       def Given(message, options = {})
         RSpec.world.reporter.example_step_started(self, :given, message, options)
         if block_given? && !options[:pending]
-          yield
+          begin
+            yield
+          rescue Exception => e
+            RSpec.world.reporter.example_step_failed(self, :given, message, options)
+            raise e
+          end
           RSpec.world.reporter.example_step_passed(self, :given, message, options)
         else
           RSpec.world.reporter.example_step_pending(self, :given, message, options)
@@ -21,7 +26,12 @@ module RSpec
       def When(message, options = {})
         RSpec.world.reporter.example_step_started(self, :when, message, options)
         if block_given? && !options[:pending]
-          yield
+          begin
+            yield
+          rescue Exception => e
+            RSpec.world.reporter.example_step_failed(self, :when, message, options)
+            raise e
+          end
           RSpec.world.reporter.example_step_passed(self, :when, message, options)
         else
           RSpec.world.reporter.example_step_pending(self, :when, message, options)
@@ -31,7 +41,12 @@ module RSpec
       def Then(message, options = {})
         RSpec.world.reporter.example_step_started(self, :then, message, options)
         if block_given? && !options[:pending]
-          yield
+          begin
+            yield
+          rescue Exception => e
+            RSpec.world.reporter.example_step_failed(self, :then, message, options)
+            raise e
+          end
           RSpec.world.reporter.example_step_passed(self, :then, message, options)
         else
           RSpec.world.reporter.example_step_pending(self, :then, message, options)
@@ -41,7 +56,12 @@ module RSpec
       def And(message, options = {})
         RSpec.world.reporter.example_step_started(self, :and, message, options)
         if block_given? && !options[:pending]
-          yield
+          begin
+            yield
+          rescue Exception => e
+            RSpec.world.reporter.example_step_failed(self, :and, message, options)
+            raise e
+          end
           RSpec.world.reporter.example_step_passed(self, :and, message, options)
         else
           RSpec.world.reporter.example_step_pending(self, :and, message, options)
@@ -51,12 +71,18 @@ module RSpec
       def But(message, options = {})
         RSpec.world.reporter.example_step_started(self, :but, message, options)
         if block_given? && !options[:pending]
-          yield
+          begin
+            yield
+          rescue Exception => e
+            RSpec.world.reporter.example_step_failed(self, :but, message, options)
+            raise e
+          end
           RSpec.world.reporter.example_step_passed(self, :but, message, options)
         else
           RSpec.world.reporter.example_step_pending(self, :but, message, options)
         end
       end
+
     end
   end
 end

data/rspec-example_steps.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rspec-example_steps"
-  s.version     = "0.1.2"
+  s.version     = "0.2.0"
   s.authors     = ["Andriy Yanko"]
   s.email       = ["andriy.yanko@gmail.com"]
   s.homepage    = "https://github.com/railsware/rspec-example_steps"

data/spec/example_steps_spec.rb

@@ -36,23 +36,23 @@ describe "example steps" do
 
   describe "Steps without blocks" do
     Steps "they should be pending" do
-      Given "given step without block"
-      Then "then step without block"
-      When "when step without block"
+      Given "step without block"
+      Then "step without block"
+      When "step without block"
     end
   end
 
   describe "Steps with :pending option" do
     Steps "they should be pending when :pending => true" do
-      Given "given step with :pending option", :pending => true do
+      Given "step with :pending option", :pending => true do
         raise "Should not be evaluated"
       end
 
-      When "when step with :pending option", :pending => true do
+      When "step with :pending option", :pending => true do
         raise "Should not be evaluated"
       end
 
-      Then "then step with :pending option", :pending => true do
+      Then "step with :pending option", :pending => true do
         raise "Should not be evaluated"
       end
 
@@ -66,34 +66,68 @@ describe "example steps" do
     end
 
     Steps "they should be pending when :pending => STRING" do
-      Given "given step with :pending option", :pending => "WIP" do
+      Given "step with :pending option", :pending => "WIP" do
         raise "Should not be evaluated"
       end
 
-      When "when step with :pending option", :pending => "POSTPONED" do
+      When "step with :pending option", :pending => "POSTPONED" do
         raise "Should not be evaluated"
       end
 
-      Then "then step with :pending option", :pending => "DELAYED" do
+      Then "step with :pending option", :pending => "DELAYED" do
         raise "Should not be evaluated"
       end
     end
 
     Steps "they should NOT be pending when :pending => false" do
-      Given "given step with :pending option", :pending => false do
+      Given "step with :pending option", :pending => false do
       end
 
-      When "when step with :pending option", :pending => false do
+      When "step with :pending option", :pending => false do
       end
 
-      Then "then step with :pending option", :pending => false do
+      Then "step with :pending option", :pending => false do
       end
 
-      And "and step with :pending option", :pending => false do
+      And "step with :pending option", :pending => false do
       end
 
-      But "and step with :pending option", :pending => false do
+      But "step with :pending option", :pending => false do
       end
     end
   end
+
+
+
+  describe "Failed steps" do
+
+    Steps "Given fails" do
+      Given "thing" do
+        1/0
+      end
+
+      Then "I should see error" do
+      end
+    end
+
+
+    Steps "When fails" do
+      When "action" do
+        (2*2).should == 5
+      end
+
+      Then "I should see error" do
+      end
+    end
+
+    Steps "Then fails" do
+      Then "result" do
+        raise Exception
+      end
+
+      Then "I should see error" do
+      end
+    end
+
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-example_steps
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andriy Yanko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 +02:00
+date: 2012-01-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency