Permalink
Browse files

Capybara::DSL is no longer mixed into controller spec

Resolves #813
  • Loading branch information...
alindeman committed Dec 9, 2013
1 parent 8e65fba commit 34483cc663fd30d49a04423f53c2f85205b52574
Showing with 1 addition and 4 deletions.
  1. +1 −4 lib/rspec/rails/vendor/capybara.rb
@@ -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)

0 comments on commit 34483cc

Please sign in to comment.