Permalink
Browse files

Merge pull request #809 from jnicklas/rspec-type

set rspec type to :feature instead
  • Loading branch information...
2 parents 7fa75e5 + de34c63 commit 9c0093a06a49e1b676683ce145a91ce4f23028c2 @jnicklas jnicklas committed Sep 9, 2012
Showing with 4 additions and 6 deletions.
  1. +2 −4 lib/capybara/rspec.rb
  2. +1 −1 lib/capybara/rspec/features.rb
  3. +1 −1 spec/rspec_spec.rb
@@ -5,10 +5,8 @@
require 'capybara/rspec/features'
RSpec.configure do |config|
- config.include Capybara::DSL, :type => :request
- config.include Capybara::DSL, :type => :acceptance
- config.include Capybara::RSpecMatchers, :type => :request
- config.include Capybara::RSpecMatchers, :type => :acceptance
+ config.include Capybara::DSL, :type => :feature
+ config.include Capybara::RSpecMatchers, :type => :feature
# The before and after blocks must run instantaneously, because Capybara
# might not actually be used in all examples where it's included.
config.after do
@@ -12,7 +12,7 @@ def self.included(base)
def self.feature(*args, &block)
options = if args.last.is_a?(Hash) then args.pop else {} end
options[:capybara_feature] = true
- options[:type] = :request
+ options[:type] = :feature
options[:caller] ||= caller
args.push(options)
View
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe 'capybara/rspec', :type => :request do
+describe 'capybara/rspec', :type => :feature do
it "should include Capybara in rspec" do
visit('/foo')
page.body.should include('Another World')

0 comments on commit 9c0093a

Please sign in to comment.