Skip to content

Commit

Permalink
Merge pull request #253 from cucumber/fix-rails-requiring-mini-test
Browse files Browse the repository at this point in the history
`rake cucumber` fails on new rails 4 project with both rspec and cucumber
  • Loading branch information
Kosmas committed Aug 27, 2013
2 parents 5fb9126 + e23a69f commit 974c933
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

* Added MIT licence in gemspec ([#261] (https://github.com/cucumber/cucumber-rails/issues/261#issuecomment-23260956) Benjamin Fleischer)

### Bugfixes
* Prevent MiniTest running `at_exit` when running cucumber ([#253](https://github.com/cucumber/cucumber-rails/issues/253) Steve Tooke)

## [v1.4.0](https://github.com/cucumber/cucumber-rails/compare/v1.3.1...v1.4.0) (2013-08-23)

### New Features
Expand Down
2 changes: 1 addition & 1 deletion cucumber-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |s|

s.license = 'MIT'

s.add_runtime_dependency('cucumber', '>= 1.2.0')
s.add_runtime_dependency('cucumber', '>= 1.3.6')
s.add_runtime_dependency('nokogiri', '>= 1.5.0')
s.add_runtime_dependency('capybara', '>= 1.1.2')
s.add_runtime_dependency('rails', '>= 3.0.0')
Expand Down
1 change: 1 addition & 0 deletions lib/cucumber/rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
require 'cucumber/rails/capybara'
require 'cucumber/rails/database'

MultiTest.disable_autorun
else
warn "WARNING: Cucumber-rails required outside of env.rb. The rest of loading is being deferred until env.rb is called.
To avoid this warning, move 'gem \'cucumber-rails\', :require => false' under only group :test in your Gemfile.
Expand Down

0 comments on commit 974c933

Please sign in to comment.