Skip to content

Commit 47ef3da

Browse files
authored
Merge pull request #102 from rafiss/update-activerecord
Update ActiveRecord tests to use v5.2
2 parents ae770fe + ee669f4 commit 47ef3da

File tree

6 files changed

+172
-167
lines changed

6 files changed

+172
-167
lines changed

ruby/activerecord/Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ end
77

88

99
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
10-
gem 'rails', '~> 5.1.1'
11-
gem 'activerecord-cockroachdb-adapter', '~> 0.2.2'
10+
gem 'rails', '~> 5.2.4'
11+
gem 'activerecord-cockroachdb-adapter', '~> 5.2'
1212
# Use Puma as the app server
13-
gem 'puma', '~> 3.0'
13+
gem 'puma', '~> 3.12'
1414
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
1515
# gem 'jbuilder', '~> 2.5'
1616
# Use Redis adapter to run Action Cable in production

ruby/activerecord/Gemfile.lock

Lines changed: 93 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,142 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.1)
5-
actionpack (= 5.1.1)
4+
actioncable (5.2.4.3)
5+
actionpack (= 5.2.4.3)
66
nio4r (~> 2.0)
7-
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.1)
9-
actionpack (= 5.1.1)
10-
actionview (= 5.1.1)
11-
activejob (= 5.1.1)
7+
websocket-driver (>= 0.6.1)
8+
actionmailer (5.2.4.3)
9+
actionpack (= 5.2.4.3)
10+
actionview (= 5.2.4.3)
11+
activejob (= 5.2.4.3)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.1)
15-
actionview (= 5.1.1)
16-
activesupport (= 5.1.1)
17-
rack (~> 2.0)
18-
rack-test (~> 0.6.3)
14+
actionpack (5.2.4.3)
15+
actionview (= 5.2.4.3)
16+
activesupport (= 5.2.4.3)
17+
rack (~> 2.0, >= 2.0.8)
18+
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.1)
22-
activesupport (= 5.1.1)
21+
actionview (5.2.4.3)
22+
activesupport (= 5.2.4.3)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.1)
28-
activesupport (= 5.1.1)
27+
activejob (5.2.4.3)
28+
activesupport (= 5.2.4.3)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.1)
31-
activesupport (= 5.1.1)
32-
activerecord (5.1.1)
33-
activemodel (= 5.1.1)
34-
activesupport (= 5.1.1)
35-
arel (~> 8.0)
36-
activerecord-cockroachdb-adapter (0.2.2)
37-
activerecord (~> 5.1, >= 5.1.1)
38-
pg (>= 0.20, < 0.22)
39-
activesupport (5.1.1)
30+
activemodel (5.2.4.3)
31+
activesupport (= 5.2.4.3)
32+
activerecord (5.2.4.3)
33+
activemodel (= 5.2.4.3)
34+
activesupport (= 5.2.4.3)
35+
arel (>= 9.0)
36+
activerecord-cockroachdb-adapter (5.2.0)
37+
activerecord (~> 5.2)
38+
pg (>= 0.20)
39+
activestorage (5.2.4.3)
40+
actionpack (= 5.2.4.3)
41+
activerecord (= 5.2.4.3)
42+
marcel (~> 0.3.1)
43+
activesupport (5.2.4.3)
4044
concurrent-ruby (~> 1.0, >= 1.0.2)
41-
i18n (~> 0.7)
45+
i18n (>= 0.7, < 2)
4246
minitest (~> 5.1)
4347
tzinfo (~> 1.1)
44-
arel (8.0.0)
45-
builder (3.2.3)
46-
byebug (9.0.6)
47-
concurrent-ruby (1.0.5)
48-
erubi (1.6.0)
49-
ffi (1.9.18)
50-
globalid (0.4.0)
48+
arel (9.0.0)
49+
builder (3.2.4)
50+
byebug (11.1.3)
51+
concurrent-ruby (1.1.6)
52+
crass (1.0.6)
53+
erubi (1.9.0)
54+
ffi (1.13.1)
55+
globalid (0.4.2)
5156
activesupport (>= 4.2.0)
52-
i18n (0.8.4)
57+
i18n (1.8.3)
58+
concurrent-ruby (~> 1.0)
5359
listen (3.0.8)
5460
rb-fsevent (~> 0.9, >= 0.9.4)
5561
rb-inotify (~> 0.9, >= 0.9.7)
56-
loofah (2.0.3)
62+
loofah (2.5.0)
63+
crass (~> 1.0.2)
5764
nokogiri (>= 1.5.9)
58-
mail (2.6.6)
59-
mime-types (>= 1.16, < 4)
60-
method_source (0.8.2)
61-
mime-types (3.1)
62-
mime-types-data (~> 3.2015)
63-
mime-types-data (3.2016.0521)
64-
mini_portile2 (2.2.0)
65-
minitest (5.10.2)
66-
nio4r (2.1.0)
67-
nokogiri (1.8.0)
68-
mini_portile2 (~> 2.2.0)
69-
pg (0.21.0)
70-
puma (3.10.0)
71-
rack (2.0.3)
72-
rack-test (0.6.3)
73-
rack (>= 1.0)
74-
rails (5.1.1)
75-
actioncable (= 5.1.1)
76-
actionmailer (= 5.1.1)
77-
actionpack (= 5.1.1)
78-
actionview (= 5.1.1)
79-
activejob (= 5.1.1)
80-
activemodel (= 5.1.1)
81-
activerecord (= 5.1.1)
82-
activesupport (= 5.1.1)
83-
bundler (>= 1.3.0, < 2.0)
84-
railties (= 5.1.1)
65+
mail (2.7.1)
66+
mini_mime (>= 0.1.1)
67+
marcel (0.3.3)
68+
mimemagic (~> 0.3.2)
69+
method_source (1.0.0)
70+
mimemagic (0.3.5)
71+
mini_mime (1.0.2)
72+
mini_portile2 (2.4.0)
73+
minitest (5.14.1)
74+
nio4r (2.5.2)
75+
nokogiri (1.10.9)
76+
mini_portile2 (~> 2.4.0)
77+
pg (1.2.3)
78+
puma (3.12.6)
79+
rack (2.2.2)
80+
rack-test (1.1.0)
81+
rack (>= 1.0, < 3)
82+
rails (5.2.4.3)
83+
actioncable (= 5.2.4.3)
84+
actionmailer (= 5.2.4.3)
85+
actionpack (= 5.2.4.3)
86+
actionview (= 5.2.4.3)
87+
activejob (= 5.2.4.3)
88+
activemodel (= 5.2.4.3)
89+
activerecord (= 5.2.4.3)
90+
activestorage (= 5.2.4.3)
91+
activesupport (= 5.2.4.3)
92+
bundler (>= 1.3.0)
93+
railties (= 5.2.4.3)
8594
sprockets-rails (>= 2.0.0)
8695
rails-dom-testing (2.0.3)
8796
activesupport (>= 4.2.0)
8897
nokogiri (>= 1.6)
89-
rails-html-sanitizer (1.0.3)
90-
loofah (~> 2.0)
91-
railties (5.1.1)
92-
actionpack (= 5.1.1)
93-
activesupport (= 5.1.1)
98+
rails-html-sanitizer (1.3.0)
99+
loofah (~> 2.3)
100+
railties (5.2.4.3)
101+
actionpack (= 5.2.4.3)
102+
activesupport (= 5.2.4.3)
94103
method_source
95104
rake (>= 0.8.7)
96-
thor (>= 0.18.1, < 2.0)
97-
rake (12.0.0)
98-
rb-fsevent (0.9.8)
99-
rb-inotify (0.9.8)
100-
ffi (>= 0.5.0)
101-
spring (2.0.2)
102-
activesupport (>= 4.2)
105+
thor (>= 0.19.0, < 2.0)
106+
rake (13.0.1)
107+
rb-fsevent (0.10.4)
108+
rb-inotify (0.10.1)
109+
ffi (~> 1.0)
110+
spring (2.1.0)
103111
spring-watcher-listen (2.0.1)
104112
listen (>= 2.7, < 4.0)
105113
spring (>= 1.2, < 3.0)
106-
sprockets (3.7.1)
114+
sprockets (4.0.2)
107115
concurrent-ruby (~> 1.0)
108116
rack (> 1, < 3)
109-
sprockets-rails (3.2.0)
117+
sprockets-rails (3.2.1)
110118
actionpack (>= 4.0)
111119
activesupport (>= 4.0)
112120
sprockets (>= 3.0.0)
113-
thor (0.19.4)
121+
thor (1.0.1)
114122
thread_safe (0.3.6)
115-
tzinfo (1.2.3)
123+
tzinfo (1.2.7)
116124
thread_safe (~> 0.1)
117-
websocket-driver (0.6.5)
125+
websocket-driver (0.7.2)
118126
websocket-extensions (>= 0.1.0)
119-
websocket-extensions (0.1.2)
127+
websocket-extensions (0.1.5)
120128

121129
PLATFORMS
122130
ruby
123131

124132
DEPENDENCIES
125-
activerecord-cockroachdb-adapter (~> 0.2.2)
133+
activerecord-cockroachdb-adapter (~> 5.2)
126134
byebug
127135
listen (~> 3.0.5)
128-
puma (~> 3.0)
129-
rails (~> 5.1.1)
136+
puma (~> 3.12)
137+
rails (~> 5.2.4)
130138
spring
131139
spring-watcher-listen (~> 2.0.0)
132140

133141
BUNDLED WITH
134-
1.15.1
142+
2.1.4

ruby/activerecord/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ start:
2424

2525
.PHONY: deps
2626
deps:
27-
@gem install bundler:1.15.1
27+
@gem install bundler:2.1.4
2828
@bin/bundle

ruby/activerecord/config/initializers/new_framework_defaults.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@
1111
# Require `belongs_to` associations by default. Previous versions had false.
1212
Rails.application.config.active_record.belongs_to_required_by_default = true
1313

14-
# Do not halt callback chains when a callback returns false. Previous versions had true.
15-
ActiveSupport.halt_callback_chains_on_return_false = false
16-
1714
# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
1815
Rails.application.config.ssl_options = { hsts: { subdomains: true } }

ruby/ar4/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '4.2.9'
5+
gem 'rails', '4.2.11'
66
gem 'activerecord-cockroachdb-adapter', '~> 0.1.5'
77
# Use SCSS for stylesheets
88
gem 'sass-rails', '~> 5.0'

0 commit comments

Comments
 (0)