Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into respond-to-controller-name

  • Loading branch information...
commit 7157016d5e1602c4982eebc49a51432658e51867 2 parents c41c984 + e1b4367
Billy Chan billychan authored
Showing with 4 additions and 4 deletions.
  1. +3 −0  Changelog.md
  2. +1 −4 lib/rspec/rails/vendor/capybara.rb
3  Changelog.md
View
@@ -12,6 +12,9 @@ Enhancements
Breaking Changes for 3.0.0:
* Removes the `--webrat` option for the request spec generator (Andy Lindeman)
+* Methods from `Capybara::DSL` (e.g., `visit`) are no longer available in
+ controller specs. It is more appropriate to use capybara in feature specs
+ (`spec/features`) instead. (Andy Lindeman)
### 3.0.0.beta1 / 2013-11-07
[full changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta1...v3.0.0.beta1)
5 lib/rspec/rails/vendor/capybara.rb
View
@@ -11,7 +11,6 @@
if defined?(Capybara)
RSpec.configure do |c|
if defined?(Capybara::DSL)
- c.include Capybara::DSL, :type => :controller
c.include Capybara::DSL, :type => :feature
end
@@ -20,9 +19,7 @@
c.include Capybara::RSpecMatchers, :type => :helper
c.include Capybara::RSpecMatchers, :type => :mailer
c.include Capybara::RSpecMatchers, :type => :controller
- c.include Capybara::RSpecMatchers, :example_group => {
- :file_path => c.escaped_path(%w[spec features])
- }
+ c.include Capybara::RSpecMatchers, :type => :feature
end
unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
Please sign in to comment.
Something went wrong with that request. Please try again.