Skip to content

Commit 14db3e6

Browse files
author
Sam Phippen
committed
Bring RSpec current with rails 5 beta 3
Biggest issue here is a regression introduced in the rails controller testing gem which forces us to do a require of `action_controller/metal/rendering` in order to not give a NameError when booting our test app.
1 parent a52dca9 commit 14db3e6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ matrix:
5858
- rvm: 2.2.2
5959
env: RAILS_VERSION=master
6060
- rvm: 2.2.2
61-
env: RAILS_VERSION=5.0.0.beta2
61+
env: RAILS_VERSION=5.0.0.beta3
6262
- rvm: 2.3.0
6363
env: RAILS_VERSION=master
6464
- rvm: 2.3.0
65-
env: RAILS_VERSION=5.0.0.beta2
65+
env: RAILS_VERSION=5.0.0.beta3
6666
exclude:
6767
# 3.0.x is not supported on MRI 2.0+
6868
- rvm: 2.0.0

lib/rspec/rails/configuration.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require "action_controller/metal/rendering"
2+
13
module RSpec
24
module Rails
35
# Fake class to document RSpec Rails configuration options. In practice,

0 commit comments

Comments
 (0)