Skip to content

Commit 1ba62c6

Browse files
committed
Relax and test against Rails master (6.0.0.alpha)
1 parent b0b1ef4 commit 1ba62c6

File tree

4 files changed

+89
-4
lines changed

4 files changed

+89
-4
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ gemfile:
99
- Gemfile
1010
- gemfiles/Gemfile-rails-5-0
1111
- gemfiles/Gemfile-rails-5-2
12+
- gemfiles/Gemfile-rails-master
1213
matrix:
1314
allow_failures:
1415
- rvm: ruby-head

gemfiles/Gemfile-rails-master

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source 'https://rubygems.org'
2+
gemspec path: '..'
3+
4+
gem 'actionpack', git: "[email protected]:rails/rails.git"

gemfiles/Gemfile-rails-master.lock

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
GIT
2+
remote: [email protected]:rails/rails.git
3+
revision: 32aa7cdd8f031dc756fdde3501efca7ff72bf576
4+
specs:
5+
actionpack (6.0.0.alpha)
6+
actionview (= 6.0.0.alpha)
7+
activesupport (= 6.0.0.alpha)
8+
rack (~> 2.0)
9+
rack-test (>= 0.6.3)
10+
rails-dom-testing (~> 2.0)
11+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
12+
actionview (6.0.0.alpha)
13+
activesupport (= 6.0.0.alpha)
14+
builder (~> 3.1)
15+
erubi (~> 1.4)
16+
rails-dom-testing (~> 2.0)
17+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
18+
activesupport (6.0.0.alpha)
19+
concurrent-ruby (~> 1.0, >= 1.0.2)
20+
i18n (>= 0.7, < 2)
21+
minitest (~> 5.1)
22+
tzinfo (~> 1.1)
23+
railties (6.0.0.alpha)
24+
actionpack (= 6.0.0.alpha)
25+
activesupport (= 6.0.0.alpha)
26+
method_source
27+
rake (>= 0.8.7)
28+
thor (>= 0.19.0, < 2.0)
29+
30+
PATH
31+
remote: ..
32+
specs:
33+
rails-controller-testing (1.0.2)
34+
actionpack (>= 5.0.1, < 6.1.x)
35+
actionview (>= 5.0.1, < 6.1.x)
36+
activesupport (>= 5.0.1, < 6.1.x)
37+
38+
GEM
39+
remote: https://rubygems.org/
40+
specs:
41+
builder (3.2.3)
42+
concurrent-ruby (1.0.5)
43+
crass (1.0.4)
44+
erubi (1.7.1)
45+
i18n (1.0.1)
46+
concurrent-ruby (~> 1.0)
47+
loofah (2.2.2)
48+
crass (~> 1.0.2)
49+
nokogiri (>= 1.5.9)
50+
method_source (0.9.0)
51+
mini_portile2 (2.3.0)
52+
minitest (5.11.3)
53+
nokogiri (1.8.2)
54+
mini_portile2 (~> 2.3.0)
55+
rack (2.0.5)
56+
rack-test (1.0.0)
57+
rack (>= 1.0, < 3)
58+
rails-dom-testing (2.0.3)
59+
activesupport (>= 4.2.0)
60+
nokogiri (>= 1.6)
61+
rails-html-sanitizer (1.0.4)
62+
loofah (~> 2.2, >= 2.2.2)
63+
rake (12.3.1)
64+
sqlite3 (1.3.13)
65+
thor (0.20.0)
66+
thread_safe (0.3.6)
67+
tzinfo (1.2.5)
68+
thread_safe (~> 0.1)
69+
70+
PLATFORMS
71+
ruby
72+
73+
DEPENDENCIES
74+
actionpack!
75+
rails-controller-testing!
76+
railties (> 5.0.1, < 6.1.x)
77+
sqlite3
78+
79+
BUNDLED WITH
80+
1.16.1

rails-controller-testing.gemspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
1818

1919
s.required_ruby_version = '>= 2.2.2'
2020

21-
s.add_dependency "actionpack", "~> 5.x", ">= 5.0.1"
22-
s.add_dependency "actionview", "~> 5.x", ">= 5.0.1"
23-
s.add_dependency "activesupport", "~> 5.x"
21+
s.add_dependency "actionpack", ">= 5.0.1", "< 6.1.x"
22+
s.add_dependency "actionview", ">= 5.0.1", "< 6.1.x"
23+
s.add_dependency "activesupport", ">= 5.0.1", "< 6.1.x"
2424

25-
s.add_development_dependency "railties", "~> 5.x"
25+
s.add_development_dependency "railties", "> 5.0.1", "< 6.1.x"
2626

2727
if defined?(JRUBY_VERSION)
2828
s.add_development_dependency "jdbc-sqlite3"

0 commit comments

Comments
 (0)