From 6416658461e851a96745d040ec72588fde70f206 Mon Sep 17 00:00:00 2001
From: Yi Wen <ywen.github@gmail.com>
Date: Tue, 16 Jul 2013 14:20:34 -0500
Subject: [PATCH 1/3] Add changelog and bumped the version

---
 CHANGELOG.md           | 7 ++++++-
 lib/spinach/version.rb | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ce65158..52353051 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
+== 0.8.4
+* fixed #138: The pending steps should abort the remaining scenario, but continue running other scenarios
+* added the feature #140: Allow blockless step definitions
+
+
 == 0.8.3
-* Add ```--fail-fast``` option. When specified, the suite will terminate after the first failed scenario
+* add ```--fail-fast``` option. when specified, the suite will terminate after the first failed scenario
 
 == 0.8.2
 * upgrade to gherkin-ruby 0.3 in order to avoid naming conflicts when using at
diff --git a/lib/spinach/version.rb b/lib/spinach/version.rb
index 1d14b612..7c68a2df 100644
--- a/lib/spinach/version.rb
+++ b/lib/spinach/version.rb
@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

From fde1f3629d717139b5d9994b223e2bf3ad061529 Mon Sep 17 00:00:00 2001
From: Yi Wen <ywen.github@gmail.com>
Date: Tue, 16 Jul 2013 14:32:56 -0500
Subject: [PATCH 2/3] Add a debug statement for travis-ci

The local passes but not on the travis-ci
---
 .ruby-version                  | 2 +-
 features/support/filesystem.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 0ca8caf7..cb506813 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-1.9.3-p327
+2.0.0-p247
diff --git a/features/support/filesystem.rb b/features/support/filesystem.rb
index 599de5f0..2bdb0b3d 100644
--- a/features/support/filesystem.rb
+++ b/features/support/filesystem.rb
@@ -67,6 +67,8 @@ def run(command)
       rout.close
       rerr.close
 
+      puts @stdout
+      puts @stderr
       @last_exit_status = status.exitstatus
     end
   end

From e123be2d2458fdced1f3d52346c8e14f11f6df1d Mon Sep 17 00:00:00 2001
From: Yi Wen <ywen.github@gmail.com>
Date: Tue, 16 Jul 2013 15:32:26 -0500
Subject: [PATCH 3/3] Fix rspec feature

Need to include rspec/expectations explicitly
---
 Gemfile                            | 1 +
 features/support/filesystem.rb     | 2 --
 features/support/spinach_runner.rb | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4dc4f297..d3ba572f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ group :test do
   gem 'guard-minitest'
   gem 'guard-spinach'
   gem 'capybara', '~> 2.0.0'
+  gem "rspec"
 end
 
 group :darwin do
diff --git a/features/support/filesystem.rb b/features/support/filesystem.rb
index 2bdb0b3d..599de5f0 100644
--- a/features/support/filesystem.rb
+++ b/features/support/filesystem.rb
@@ -67,8 +67,6 @@ def run(command)
       rout.close
       rerr.close
 
-      puts @stdout
-      puts @stderr
       @last_exit_status = status.exitstatus
     end
   end
diff --git a/features/support/spinach_runner.rb b/features/support/spinach_runner.rb
index 9220cf0d..6598c759 100644
--- a/features/support/spinach_runner.rb
+++ b/features/support/spinach_runner.rb
@@ -37,7 +37,7 @@ def use_minitest
 
     def use_rspec
       write_file('features/support/minitest.rb',
-                "require 'rspec'")
+                "require 'rspec/core'\nrequire 'rspec/expectations'")
     end
   end
 end