Permalink
Browse files

Revert pull request #157 - it broke our features.

  • Loading branch information...
1 parent 19f7e02 commit 479f20a199644ed1a345d40f1b7967a60d4980ac @aslakhellesoy aslakhellesoy committed Sep 11, 2011
Showing with 1 addition and 2 deletions.
  1. +0 −1 History.md
  2. +1 −1 lib/generators/cucumber/install/templates/config/cucumber.yml.erb
View
@@ -2,7 +2,6 @@
### Bugfixes
* sqlite3-ruby is now sqlite3 ([#158](https://github.com/cucumber/cucumber-rails/pull/158) Trung Le)
-* Require features by default in the generated cucumber.yml ((#157)[https://github.com/cucumber/cucumber-rails/pull/157] Mario Visic)
* Broken link in the USAGE file of the features generator ((#156)[https://github.com/cucumber/cucumber-rails/pull/156] Pablo Alonso García)
* Rails destroy cucumber:feature deletes the steps folder, even though it's not empty. ((#154)[https://github.com/cucumber/cucumber-rails/pull/154], (#111)[https://github.com/cucumber/cucumber-rails/issues/111] mblake)
@@ -1,7 +1,7 @@
<%%
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags --require features ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
%>
default: <%= spork? ? '--drb ' : '' %><%%= std_opts %> features
wip: <%= spork? ? '--drb ' : '' %>--tags @wip:3 --wip features

0 comments on commit 479f20a

Please sign in to comment.