Skip to content

Commit 23a0858

Browse files
committed
setup testing against rails 5.0 beta1 (using rack 2.0.alpha)
1 parent 0d40a1b commit 23a0858

File tree

4 files changed

+149
-85
lines changed

4 files changed

+149
-85
lines changed

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ matrix:
6666
- rvm: jruby-9.0.4.0
6767
gemfile: gemfiles/rails42.gemfile
6868
jdk: oraclejdk8
69+
# rails NG
70+
- rvm: jruby-9.0.4.0
71+
gemfile: gemfiles/railsNG.gemfile
72+
jdk: oraclejdk7
73+
- rvm: jruby-9.0.4.0
74+
gemfile: gemfiles/railsNG.gemfile
75+
jdk: oraclejdk8
6976
## rails 2.3 --1.8
7077
- rvm: jruby-1.7.4
7178
gemfile: gemfiles/rails23.gemfile

Appraisals

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ appraise "rails42" do
2929
end
3030

3131
appraise "railsNG" do
32-
gem 'rails', :github => 'rails/rails', :branch => 'master'
33-
gem 'arel', :github => 'rails/arel', :branch => 'master'
32+
gem 'rails', "5.0.0.beta1"
33+
#gem 'rails', :github => 'rails/rails', :branch => 'master'
34+
#gem 'arel', :github => 'rails/arel', :branch => 'master'
3435
end

gemfiles/railsNG.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ source "https://rubygems.org"
44

55
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7-
gem "rails", :github=>"rails/rails", :branch=>"master"
8-
gem "arel", :github=>"rails/arel", :branch=>"master"
7+
gem "rails", "5.0.0.beta1"
98

gemfiles/railsNG.gemfile.lock

Lines changed: 138 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,133 @@
1-
GIT
2-
remote: git://github.com/rails/arel.git
3-
revision: 51d552c2cdcb749c2aaa96e982b5789b73f12f56
4-
branch: master
5-
specs:
6-
arel (6.0.0.20140505020427)
7-
8-
GIT
9-
remote: git://github.com/rails/rails.git
10-
revision: dd16a1029ac34c09ce66fe7b088431bba920c1ba
11-
branch: master
1+
GEM
2+
remote: https://rubygems.org/
123
specs:
13-
actionmailer (4.2.0.alpha)
14-
actionpack (= 4.2.0.alpha)
15-
actionview (= 4.2.0.alpha)
16-
mail (~> 2.5.4)
17-
actionpack (4.2.0.alpha)
18-
actionview (= 4.2.0.alpha)
19-
activesupport (= 4.2.0.alpha)
20-
rack (~> 1.5.2)
21-
rack-test (~> 0.6.2)
22-
actionview (4.2.0.alpha)
23-
activesupport (= 4.2.0.alpha)
4+
actioncable (5.0.0.beta1)
5+
actionpack (= 5.0.0.beta1)
6+
celluloid (~> 0.17.2)
7+
coffee-rails (~> 4.1.0)
8+
em-hiredis (~> 0.3.0)
9+
faye-websocket (~> 0.10.0)
10+
redis (~> 3.0)
11+
websocket-driver (~> 0.6.1)
12+
actionmailer (5.0.0.beta1)
13+
actionpack (= 5.0.0.beta1)
14+
actionview (= 5.0.0.beta1)
15+
activejob (= 5.0.0.beta1)
16+
mail (~> 2.5, >= 2.5.4)
17+
rails-dom-testing (~> 1.0, >= 1.0.5)
18+
actionpack (5.0.0.beta1)
19+
actionview (= 5.0.0.beta1)
20+
activesupport (= 5.0.0.beta1)
21+
rack (~> 2.x)
22+
rack-test (~> 0.6.3)
23+
rails-dom-testing (~> 1.0, >= 1.0.5)
24+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
25+
actionview (5.0.0.beta1)
26+
activesupport (= 5.0.0.beta1)
2427
builder (~> 3.1)
2528
erubis (~> 2.7.0)
26-
activemodel (4.2.0.alpha)
27-
activesupport (= 4.2.0.alpha)
29+
rails-dom-testing (~> 1.0, >= 1.0.5)
30+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
31+
activejob (5.0.0.beta1)
32+
activesupport (= 5.0.0.beta1)
33+
globalid (>= 0.3.6)
34+
activemodel (5.0.0.beta1)
35+
activesupport (= 5.0.0.beta1)
2836
builder (~> 3.1)
29-
activerecord (4.2.0.alpha)
30-
activemodel (= 4.2.0.alpha)
31-
activesupport (= 4.2.0.alpha)
32-
arel (~> 6.0.0)
33-
activesupport (4.2.0.alpha)
34-
i18n (~> 0.6, >= 0.6.9)
37+
activerecord (5.0.0.beta1)
38+
activemodel (= 5.0.0.beta1)
39+
activesupport (= 5.0.0.beta1)
40+
arel (~> 7.0)
41+
activesupport (5.0.0.beta1)
42+
concurrent-ruby (~> 1.0)
43+
i18n (~> 0.7)
3544
json (~> 1.7, >= 1.7.7)
45+
method_source
3646
minitest (~> 5.1)
37-
thread_safe (~> 0.1)
3847
tzinfo (~> 1.1)
39-
rails (4.2.0.alpha)
40-
actionmailer (= 4.2.0.alpha)
41-
actionpack (= 4.2.0.alpha)
42-
actionview (= 4.2.0.alpha)
43-
activemodel (= 4.2.0.alpha)
44-
activerecord (= 4.2.0.alpha)
45-
activesupport (= 4.2.0.alpha)
46-
bundler (>= 1.3.0, < 2.0)
47-
railties (= 4.2.0.alpha)
48-
sprockets-rails (~> 2.1)
49-
railties (4.2.0.alpha)
50-
actionpack (= 4.2.0.alpha)
51-
activesupport (= 4.2.0.alpha)
52-
rake (>= 0.8.7)
53-
thor (>= 0.18.1, < 2.0)
54-
55-
GEM
56-
remote: https://rubygems.org/
57-
specs:
48+
arel (7.0.0)
5849
builder (3.2.2)
50+
celluloid (0.17.3)
51+
celluloid-essentials
52+
celluloid-extras
53+
celluloid-fsm
54+
celluloid-pool
55+
celluloid-supervision
56+
timers (>= 4.1.1)
57+
celluloid-essentials (0.20.5)
58+
timers (>= 4.1.1)
59+
celluloid-extras (0.20.5)
60+
timers (>= 4.1.1)
61+
celluloid-fsm (0.20.5)
62+
timers (>= 4.1.1)
63+
celluloid-pool (0.20.5)
64+
timers (>= 4.1.1)
65+
celluloid-supervision (0.20.5)
66+
timers (>= 4.1.1)
67+
coffee-rails (4.1.1)
68+
coffee-script (>= 2.2.0)
69+
railties (>= 4.0.0, < 5.1.x)
70+
coffee-script (2.4.1)
71+
coffee-script-source
72+
execjs
73+
coffee-script-source (1.10.0)
74+
concurrent-ruby (1.0.0-java)
5975
diff-lcs (1.2.5)
76+
em-hiredis (0.3.0)
77+
eventmachine (~> 1.0)
78+
hiredis (~> 0.5.0)
6079
erubis (2.7.0)
61-
hike (1.2.3)
62-
i18n (0.6.9)
63-
json (1.8.1-java)
64-
mail (2.5.4)
65-
mime-types (~> 1.16)
66-
treetop (~> 1.4.8)
67-
mime-types (1.25.1)
68-
minitest (5.3.3)
69-
multi_json (1.10.0)
70-
polyglot (0.3.4)
71-
rack (1.5.2)
72-
rack-test (0.6.2)
80+
eventmachine (1.0.9.1-java)
81+
execjs (2.6.0)
82+
faye-websocket (0.10.2)
83+
eventmachine (>= 0.12.0)
84+
websocket-driver (>= 0.5.1)
85+
globalid (0.3.6)
86+
activesupport (>= 4.1.0)
87+
hiredis (0.5.2-java)
88+
hitimes (1.2.3-java)
89+
i18n (0.7.0)
90+
json (1.8.3-java)
91+
loofah (2.0.3)
92+
nokogiri (>= 1.5.9)
93+
mail (2.6.3)
94+
mime-types (>= 1.16, < 3)
95+
method_source (0.8.2)
96+
mime-types (2.99)
97+
minitest (5.8.4)
98+
nokogiri (1.6.7.2-java)
99+
rack (2.0.0.alpha)
100+
json
101+
rack-test (0.6.3)
73102
rack (>= 1.0)
74-
rake (10.3.1)
103+
rails (5.0.0.beta1)
104+
actioncable (= 5.0.0.beta1)
105+
actionmailer (= 5.0.0.beta1)
106+
actionpack (= 5.0.0.beta1)
107+
actionview (= 5.0.0.beta1)
108+
activejob (= 5.0.0.beta1)
109+
activemodel (= 5.0.0.beta1)
110+
activerecord (= 5.0.0.beta1)
111+
activesupport (= 5.0.0.beta1)
112+
bundler (>= 1.3.0, < 2.0)
113+
railties (= 5.0.0.beta1)
114+
sprockets-rails (>= 2.0.0)
115+
rails-deprecated_sanitizer (1.0.3)
116+
activesupport (>= 4.2.0.alpha)
117+
rails-dom-testing (1.0.7)
118+
activesupport (>= 4.2.0.beta, < 5.0)
119+
nokogiri (~> 1.6.0)
120+
rails-deprecated_sanitizer (>= 1.0.1)
121+
rails-html-sanitizer (1.0.2)
122+
loofah (~> 2.0)
123+
railties (5.0.0.beta1)
124+
actionpack (= 5.0.0.beta1)
125+
activesupport (= 5.0.0.beta1)
126+
method_source
127+
rake (>= 0.8.7)
128+
thor (>= 0.18.1, < 2.0)
129+
rake (10.4.2)
130+
redis (3.2.2)
75131
rspec (2.14.1)
76132
rspec-core (~> 2.14.0)
77133
rspec-expectations (~> 2.14.0)
@@ -80,29 +136,30 @@ GEM
80136
rspec-expectations (2.14.5)
81137
diff-lcs (>= 1.1.3, < 2.0)
82138
rspec-mocks (2.14.6)
83-
sprockets (2.12.1)
84-
hike (~> 1.2)
85-
multi_json (~> 1.0)
86-
rack (~> 1.0)
87-
tilt (~> 1.1, != 1.3.0)
88-
sprockets-rails (2.1.3)
89-
actionpack (>= 3.0)
90-
activesupport (>= 3.0)
91-
sprockets (~> 2.8)
139+
sprockets (3.5.2)
140+
concurrent-ruby (~> 1.0)
141+
rack (> 1, < 3)
142+
sprockets-rails (3.0.0)
143+
actionpack (>= 4.0)
144+
activesupport (>= 4.0)
145+
sprockets (>= 3.0.0)
92146
thor (0.19.1)
93-
thread_safe (0.3.3-java)
94-
tilt (1.4.1)
95-
treetop (1.4.15)
96-
polyglot
97-
polyglot (>= 0.3.1)
98-
tzinfo (1.1.0)
147+
thread_safe (0.3.5-java)
148+
timers (4.1.1)
149+
hitimes
150+
tzinfo (1.2.2)
99151
thread_safe (~> 0.1)
152+
websocket-driver (0.6.3-java)
153+
websocket-extensions (>= 0.1.0)
154+
websocket-extensions (0.1.2)
100155

101156
PLATFORMS
102157
java
103158

104159
DEPENDENCIES
105-
arel!
106-
rails!
107-
rake (~> 10.3.1)
160+
rails (= 5.0.0.beta1)
161+
rake (~> 10.4.2)
108162
rspec (~> 2.14.1)
163+
164+
BUNDLED WITH
165+
1.11.2

0 commit comments

Comments
 (0)