Merge e123be2 into 743c7fa

codegram · Jul 16, 2013 · c05b9be · c05b9be
2 parents 743c7fa + e123be2
commit c05b9be
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-1.9.3-p327
+2.0.0-p247
diff --git 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/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/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
diff --git 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