Skip to content
This repository was archived by the owner on Dec 14, 2022. It is now read-only.

Commit f7d5ad1

Browse files
authored
Merge pull request #20 from taphill/upgrades
Update Rails and Ruby versions
2 parents 2c73cba + 3220d5e commit f7d5ad1

File tree

6 files changed

+74
-76
lines changed

6 files changed

+74
-76
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.0.1

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
ruby '3.0.0'
6+
ruby '3.0.1'
77

88
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
99
gem 'rails', '~> 6.1.3'

Gemfile.lock

Lines changed: 68 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.3)
5-
actionpack (= 6.1.3)
6-
activesupport (= 6.1.3)
4+
actioncable (6.1.3.1)
5+
actionpack (= 6.1.3.1)
6+
activesupport (= 6.1.3.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.3)
10-
actionpack (= 6.1.3)
11-
activejob (= 6.1.3)
12-
activerecord (= 6.1.3)
13-
activestorage (= 6.1.3)
14-
activesupport (= 6.1.3)
9+
actionmailbox (6.1.3.1)
10+
actionpack (= 6.1.3.1)
11+
activejob (= 6.1.3.1)
12+
activerecord (= 6.1.3.1)
13+
activestorage (= 6.1.3.1)
14+
activesupport (= 6.1.3.1)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.3)
17-
actionpack (= 6.1.3)
18-
actionview (= 6.1.3)
19-
activejob (= 6.1.3)
20-
activesupport (= 6.1.3)
16+
actionmailer (6.1.3.1)
17+
actionpack (= 6.1.3.1)
18+
actionview (= 6.1.3.1)
19+
activejob (= 6.1.3.1)
20+
activesupport (= 6.1.3.1)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.3)
24-
actionview (= 6.1.3)
25-
activesupport (= 6.1.3)
23+
actionpack (6.1.3.1)
24+
actionview (= 6.1.3.1)
25+
activesupport (= 6.1.3.1)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.3)
31-
actionpack (= 6.1.3)
32-
activerecord (= 6.1.3)
33-
activestorage (= 6.1.3)
34-
activesupport (= 6.1.3)
30+
actiontext (6.1.3.1)
31+
actionpack (= 6.1.3.1)
32+
activerecord (= 6.1.3.1)
33+
activestorage (= 6.1.3.1)
34+
activesupport (= 6.1.3.1)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.3)
37-
activesupport (= 6.1.3)
36+
actionview (6.1.3.1)
37+
activesupport (= 6.1.3.1)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
4141
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.3)
43-
activesupport (= 6.1.3)
42+
activejob (6.1.3.1)
43+
activesupport (= 6.1.3.1)
4444
globalid (>= 0.3.6)
45-
activemodel (6.1.3)
46-
activesupport (= 6.1.3)
47-
activerecord (6.1.3)
48-
activemodel (= 6.1.3)
49-
activesupport (= 6.1.3)
50-
activestorage (6.1.3)
51-
actionpack (= 6.1.3)
52-
activejob (= 6.1.3)
53-
activerecord (= 6.1.3)
54-
activesupport (= 6.1.3)
55-
marcel (~> 0.3.1)
56-
mimemagic (~> 0.3.2)
57-
activesupport (6.1.3)
45+
activemodel (6.1.3.1)
46+
activesupport (= 6.1.3.1)
47+
activerecord (6.1.3.1)
48+
activemodel (= 6.1.3.1)
49+
activesupport (= 6.1.3.1)
50+
activestorage (6.1.3.1)
51+
actionpack (= 6.1.3.1)
52+
activejob (= 6.1.3.1)
53+
activerecord (= 6.1.3.1)
54+
activesupport (= 6.1.3.1)
55+
marcel (~> 1.0.0)
56+
mini_mime (~> 1.0.2)
57+
activesupport (6.1.3.1)
5858
concurrent-ruby (~> 1.0, >= 1.0.2)
5959
i18n (>= 1.6, < 2)
6060
minitest (>= 5.1)
@@ -105,34 +105,32 @@ GEM
105105
activesupport (>= 4.2.0)
106106
hashdiff (1.0.1)
107107
hashie (4.1.0)
108-
i18n (1.8.9)
108+
i18n (1.8.10)
109109
concurrent-ruby (~> 1.0)
110110
jbuilder (2.11.2)
111111
activesupport (>= 5.0.0)
112112
jwt (2.2.2)
113113
launchy (2.5.0)
114114
addressable (~> 2.7)
115-
listen (3.5.0)
115+
listen (3.5.1)
116116
rb-fsevent (~> 0.10, >= 0.10.3)
117117
rb-inotify (~> 0.9, >= 0.9.10)
118-
loofah (2.9.0)
118+
loofah (2.9.1)
119119
crass (~> 1.0.2)
120120
nokogiri (>= 1.5.9)
121121
mail (2.7.1)
122122
mini_mime (>= 0.1.1)
123-
marcel (0.3.3)
124-
mimemagic (~> 0.3.2)
123+
marcel (1.0.1)
125124
method_source (1.0.0)
126-
mimemagic (0.3.6)
127-
mini_mime (1.0.2)
125+
mini_mime (1.0.3)
128126
mini_portile2 (2.5.0)
129127
minitest (5.14.4)
130128
msgpack (1.4.2)
131129
multi_json (1.15.0)
132130
multi_xml (0.6.0)
133131
multipart-post (2.1.1)
134132
nio4r (2.5.7)
135-
nokogiri (1.11.2)
133+
nokogiri (1.11.3)
136134
mini_portile2 (~> 2.5.0)
137135
racc (~> 1.4)
138136
oauth2 (1.4.7)
@@ -141,7 +139,7 @@ GEM
141139
multi_json (~> 1.3)
142140
multi_xml (~> 0.5)
143141
rack (>= 1.2, < 3)
144-
omniauth (2.0.3)
142+
omniauth (2.0.4)
145143
hashie (>= 3.4.6)
146144
rack (>= 1.6.2, < 3)
147145
rack-protection
@@ -155,7 +153,7 @@ GEM
155153
actionpack (>= 4.2)
156154
omniauth (~> 2.0)
157155
parallel (1.20.1)
158-
parser (3.0.0.0)
156+
parser (3.0.1.0)
159157
ast (~> 2.4.1)
160158
pg (1.2.3)
161159
pry (0.14.0)
@@ -173,29 +171,29 @@ GEM
173171
rack
174172
rack-test (1.1.0)
175173
rack (>= 1.0, < 3)
176-
rails (6.1.3)
177-
actioncable (= 6.1.3)
178-
actionmailbox (= 6.1.3)
179-
actionmailer (= 6.1.3)
180-
actionpack (= 6.1.3)
181-
actiontext (= 6.1.3)
182-
actionview (= 6.1.3)
183-
activejob (= 6.1.3)
184-
activemodel (= 6.1.3)
185-
activerecord (= 6.1.3)
186-
activestorage (= 6.1.3)
187-
activesupport (= 6.1.3)
174+
rails (6.1.3.1)
175+
actioncable (= 6.1.3.1)
176+
actionmailbox (= 6.1.3.1)
177+
actionmailer (= 6.1.3.1)
178+
actionpack (= 6.1.3.1)
179+
actiontext (= 6.1.3.1)
180+
actionview (= 6.1.3.1)
181+
activejob (= 6.1.3.1)
182+
activemodel (= 6.1.3.1)
183+
activerecord (= 6.1.3.1)
184+
activestorage (= 6.1.3.1)
185+
activesupport (= 6.1.3.1)
188186
bundler (>= 1.15.0)
189-
railties (= 6.1.3)
187+
railties (= 6.1.3.1)
190188
sprockets-rails (>= 2.0.0)
191189
rails-dom-testing (2.0.3)
192190
activesupport (>= 4.2.0)
193191
nokogiri (>= 1.6)
194192
rails-html-sanitizer (1.3.0)
195193
loofah (~> 2.3)
196-
railties (6.1.3)
197-
actionpack (= 6.1.3)
198-
activesupport (= 6.1.3)
194+
railties (6.1.3.1)
195+
actionpack (= 6.1.3.1)
196+
activesupport (= 6.1.3.1)
199197
method_source
200198
rake (>= 0.8.7)
201199
thor (~> 1.0)
@@ -206,7 +204,7 @@ GEM
206204
ffi (~> 1.0)
207205
redcarpet (3.5.1)
208206
regexp_parser (2.1.1)
209-
rexml (3.2.4)
207+
rexml (3.2.5)
210208
rspec-core (3.10.1)
211209
rspec-support (~> 3.10.0)
212210
rspec-expectations (3.10.1)
@@ -224,7 +222,7 @@ GEM
224222
rspec-mocks (~> 3.10)
225223
rspec-support (~> 3.10)
226224
rspec-support (3.10.2)
227-
rubocop (1.12.0)
225+
rubocop (1.12.1)
228226
parallel (~> 1.10)
229227
parser (>= 3.0.0.0)
230228
rainbow (>= 2.2.2, < 4.0)
@@ -290,7 +288,7 @@ GEM
290288
activemodel (>= 6.0.0)
291289
bindex (>= 0.4.0)
292290
railties (>= 6.0.0)
293-
webmock (3.12.1)
291+
webmock (3.12.2)
294292
addressable (>= 2.3.6)
295293
crack (>= 0.3.2)
296294
hashdiff (>= 0.4.0, < 2.0.0)
@@ -346,7 +344,7 @@ DEPENDENCIES
346344
webpacker (~> 4.0)
347345

348346
RUBY VERSION
349-
ruby 3.0.0p0
347+
ruby 3.0.1p64
350348

351349
BUNDLED WITH
352-
2.2.3
350+
2.2.15

spec/facades/sync_facade_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
end
1414

1515
it 'creates user repos', :vcr do
16-
expect(UserRepo.all.count).to eq(76)
16+
expect(UserRepo.all.count).to eq(79)
1717
end
1818

1919
it 'creates repos', :vcr do
20-
expect(Repo.all.count).to eq(76)
20+
expect(Repo.all.count).to eq(79)
2121
expect(Repo.last.name).to eq('SOUL')
2222
end
2323
end

spec/features/users/index_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
visit welcome_index_path
1414
click_link 'Sync Account'
1515

16-
expect(page).to have_css('.user-star', count: 76)
16+
expect(page).to have_css('.user-star', count: 79)
1717

1818
within(all('.user-star').last) do
1919
expect(page).to have_link('soul-lang / SOUL')

spec/features/welcome/index_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
visit welcome_index_path
2323
click_link 'Sync Account'
2424

25-
expect(page).to have_css('.user-star', count: 76)
25+
expect(page).to have_css('.user-star', count: 79)
2626

2727
within(all('.user-star').last) do
2828
expect(page).to have_link('soul-lang / SOUL')

0 commit comments

Comments
 (0)