From c19e2951dfbf3faef86eda32744f26dabe4ad16f Mon Sep 17 00:00:00 2001 From: oleg dashevskii Date: Tue, 3 May 2011 16:14:11 +0700 Subject: [PATCH] Require capybara after rspec/rails/example Otherwise Capybara's includes are not set correctly. Fixes #360 --- lib/rspec/rails.rb | 14 ++++++++++++++ lib/rspec/rails/browser_simulators.rb | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/rspec/rails.rb b/lib/rspec/rails.rb index 07a4ce6c97..ba7225ca98 100644 --- a/lib/rspec/rails.rb +++ b/lib/rspec/rails.rb @@ -15,3 +15,17 @@ require 'rspec/rails/browser_simulators' require 'rspec/rails/example' +begin + require 'capybara/rspec' +rescue LoadError +end + +begin + require 'capybara/rails' +rescue LoadError +end + +begin + require 'webrat' +rescue LoadError +end diff --git a/lib/rspec/rails/browser_simulators.rb b/lib/rspec/rails/browser_simulators.rb index 1b85fe6beb..1132a731c6 100644 --- a/lib/rspec/rails/browser_simulators.rb +++ b/lib/rspec/rails/browser_simulators.rb @@ -1,18 +1,3 @@ -begin - require 'capybara/rspec' -rescue LoadError -end - -begin - require 'capybara/rails' -rescue LoadError -end - -begin - require 'webrat' -rescue LoadError -end - module RSpec module Rails module BrowserSimulators