Skip to content

Commit c19e295

Browse files
committed
Require capybara after rspec/rails/example
Otherwise Capybara's includes are not set correctly. Fixes rspec#360
1 parent cc6f35d commit c19e295

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

lib/rspec/rails.rb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,17 @@
1515
require 'rspec/rails/browser_simulators'
1616
require 'rspec/rails/example'
1717

18+
begin
19+
require 'capybara/rspec'
20+
rescue LoadError
21+
end
22+
23+
begin
24+
require 'capybara/rails'
25+
rescue LoadError
26+
end
27+
28+
begin
29+
require 'webrat'
30+
rescue LoadError
31+
end

lib/rspec/rails/browser_simulators.rb

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
begin
2-
require 'capybara/rspec'
3-
rescue LoadError
4-
end
5-
6-
begin
7-
require 'capybara/rails'
8-
rescue LoadError
9-
end
10-
11-
begin
12-
require 'webrat'
13-
rescue LoadError
14-
end
15-
161
module RSpec
172
module Rails
183
module BrowserSimulators

0 commit comments

Comments
 (0)