Skip to content

Commit 48e6930

Browse files
ransombriggsransombriggs
authored
Bump minitest versions to 5.14.3 (#148)
On an upcoming commit I was getting spec failures because the locked version of minitest does not work with rails 3.1.1, so bumping to one that should work: https://github.com/seattlerb/minitest/blob/master/History.rdoc#5143--2021-01-05- ``` minitest-5.14.2 requires ruby version < 3.1, >= 2.2, which is incompatible with the current version, ruby 3.1.1p18 Error: Process completed with exit code 5. ```
1 parent 59d37d2 commit 48e6930

22 files changed

+246
-71
lines changed

‎Appraisals

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
rails_dependencies = proc do
22
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
33
gem "jdbc-sqlite3", platform: :jruby
4+
install_if '-> { Gem::Requirement.new(">= 2.6.0").satisfied_by?(Gem::Version.new(RUBY_VERSION)) }' do
5+
gem "net-ftp"
6+
end
47
end
58

69
appraisals = {

‎Gemfile

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

55
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
66

7-
gem "appraisal"
7+
gem "appraisal", github: 'thoughtbot/appraisal', ref: '2f5be65b8e127bd602fd149f395f2f8fa50616a8'
88
gem "childprocess"
99
gem "climate_control"
1010
gem "pry-byebug", platform: :mri

‎gemfiles/no_rails_rspec_gte_3_10.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal"
5+
gem "appraisal", ref: "2f5be65b8e127bd602fd149f395f2f8fa50616a8", git: "https://github.com/thoughtbot/appraisal"
66
gem "childprocess"
77
gem "climate_control"
88
gem "pry-byebug", platform: :mri

‎gemfiles/no_rails_rspec_gte_3_10.gemfile.lock

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
GIT
2+
remote: https://github.com/thoughtbot/appraisal
3+
revision: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
4+
ref: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
5+
specs:
6+
appraisal (2.4.1)
7+
bundler
8+
rake
9+
thor (>= 0.14.0)
10+
111
PATH
212
remote: ..
313
specs:
@@ -9,10 +19,6 @@ PATH
919
GEM
1020
remote: https://rubygems.org/
1121
specs:
12-
appraisal (2.3.0)
13-
bundler
14-
rake
15-
thor (>= 0.14.0)
1622
ast (2.4.1)
1723
attr_extras (6.2.4)
1824
byebug (11.1.3)
@@ -62,15 +68,15 @@ GEM
6268
rubocop-ast (0.3.0)
6369
parser (>= 2.7.1.4)
6470
ruby-progressbar (1.10.1)
65-
thor (1.0.1)
71+
thor (1.2.1)
6672
unicode-display_width (1.7.0)
6773
warnings_logger (0.1.1)
6874

6975
PLATFORMS
7076
ruby
7177

7278
DEPENDENCIES
73-
appraisal
79+
appraisal!
7480
childprocess
7581
climate_control
7682
pry-byebug

‎gemfiles/no_rails_rspec_lt_3_10.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal"
5+
gem "appraisal", ref: "2f5be65b8e127bd602fd149f395f2f8fa50616a8", git: "https://github.com/thoughtbot/appraisal"
66
gem "childprocess"
77
gem "climate_control"
88
gem "pry-byebug", platform: :mri

‎gemfiles/no_rails_rspec_lt_3_10.gemfile.lock

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
GIT
2+
remote: https://github.com/thoughtbot/appraisal
3+
revision: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
4+
ref: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
5+
specs:
6+
appraisal (2.4.1)
7+
bundler
8+
rake
9+
thor (>= 0.14.0)
10+
111
PATH
212
remote: ..
313
specs:
@@ -9,10 +19,6 @@ PATH
919
GEM
1020
remote: https://rubygems.org/
1121
specs:
12-
appraisal (2.3.0)
13-
bundler
14-
rake
15-
thor (>= 0.14.0)
1622
ast (2.4.1)
1723
attr_extras (6.2.4)
1824
byebug (11.1.3)
@@ -62,15 +68,15 @@ GEM
6268
rubocop-ast (0.3.0)
6369
parser (>= 2.7.1.4)
6470
ruby-progressbar (1.10.1)
65-
thor (1.0.1)
71+
thor (1.2.1)
6672
unicode-display_width (1.7.0)
6773
warnings_logger (0.1.1)
6874

6975
PLATFORMS
7076
ruby
7177

7278
DEPENDENCIES
73-
appraisal
79+
appraisal!
7480
childprocess
7581
climate_control
7682
pry-byebug

‎gemfiles/rails_5_0_rspec_gte_3_10.gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal"
5+
gem "appraisal", ref: "2f5be65b8e127bd602fd149f395f2f8fa50616a8", git: "https://github.com/thoughtbot/appraisal"
66
gem "childprocess"
77
gem "climate_control"
88
gem "pry-byebug", platform: :mri
@@ -18,4 +18,8 @@ gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
1818
gem "rspec", ">= 3.10", "< 4"
1919
gem "rspec-rails"
2020

21+
install_if -> { Gem::Requirement.new(">= 2.6.0").satisfied_by?(Gem::Version.new(RUBY_VERSION)) } do
22+
gem "net-ftp"
23+
end
24+
2125
gemspec path: "../"

‎gemfiles/rails_5_0_rspec_gte_3_10.gemfile.lock

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
GIT
2+
remote: https://github.com/thoughtbot/appraisal
3+
revision: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
4+
ref: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
5+
specs:
6+
appraisal (2.4.1)
7+
bundler
8+
rake
9+
thor (>= 0.14.0)
10+
111
PATH
212
remote: ..
313
specs:
@@ -33,10 +43,6 @@ GEM
3343
i18n (>= 0.7, < 2)
3444
minitest (~> 5.1)
3545
tzinfo (~> 1.1)
36-
appraisal (2.3.0)
37-
bundler
38-
rake
39-
thor (>= 0.14.0)
4046
arel (7.1.4)
4147
ast (2.4.1)
4248
attr_extras (6.2.4)
@@ -47,6 +53,7 @@ GEM
4753
coderay (1.1.3)
4854
concurrent-ruby (1.1.7)
4955
crass (1.0.6)
56+
date (3.2.2)
5057
diff-lcs (1.4.4)
5158
erubis (2.7.0)
5259
i18n (1.8.5)
@@ -56,7 +63,12 @@ GEM
5663
nokogiri (>= 1.5.9)
5764
method_source (1.0.0)
5865
mini_portile2 (2.5.1)
59-
minitest (5.14.2)
66+
minitest (5.14.3)
67+
net-ftp (0.1.3)
68+
net-protocol
69+
time
70+
net-protocol (0.1.3)
71+
timeout
6072
nokogiri (1.11.3)
6173
mini_portile2 (~> 2.5.0)
6274
racc (~> 1.4)
@@ -127,6 +139,9 @@ GEM
127139
sqlite3 (1.3.13)
128140
thor (1.0.1)
129141
thread_safe (0.3.6)
142+
time (0.2.0)
143+
date
144+
timeout (0.2.0)
130145
tzinfo (1.2.7)
131146
thread_safe (~> 0.1)
132147
unicode-display_width (1.7.0)
@@ -138,10 +153,11 @@ PLATFORMS
138153
DEPENDENCIES
139154
activerecord (~> 5.0.0)
140155
activerecord-jdbcsqlite3-adapter
141-
appraisal
156+
appraisal!
142157
childprocess
143158
climate_control
144159
jdbc-sqlite3
160+
net-ftp
145161
pry-byebug
146162
pry-nav
147163
railties (~> 5.0.0)

‎gemfiles/rails_5_0_rspec_lt_3_10.gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal"
5+
gem "appraisal", ref: "2f5be65b8e127bd602fd149f395f2f8fa50616a8", git: "https://github.com/thoughtbot/appraisal"
66
gem "childprocess"
77
gem "climate_control"
88
gem "pry-byebug", platform: :mri
@@ -18,4 +18,8 @@ gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
1818
gem "rspec", "< 3.10"
1919
gem "rspec-rails"
2020

21+
install_if -> { Gem::Requirement.new(">= 2.6.0").satisfied_by?(Gem::Version.new(RUBY_VERSION)) } do
22+
gem "net-ftp"
23+
end
24+
2125
gemspec path: "../"

‎gemfiles/rails_5_0_rspec_lt_3_10.gemfile.lock

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
GIT
2+
remote: https://github.com/thoughtbot/appraisal
3+
revision: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
4+
ref: 2f5be65b8e127bd602fd149f395f2f8fa50616a8
5+
specs:
6+
appraisal (2.4.1)
7+
bundler
8+
rake
9+
thor (>= 0.14.0)
10+
111
PATH
212
remote: ..
313
specs:
@@ -33,10 +43,6 @@ GEM
3343
i18n (>= 0.7, < 2)
3444
minitest (~> 5.1)
3545
tzinfo (~> 1.1)
36-
appraisal (2.3.0)
37-
bundler
38-
rake
39-
thor (>= 0.14.0)
4046
arel (7.1.4)
4147
ast (2.4.1)
4248
attr_extras (6.2.4)
@@ -47,6 +53,7 @@ GEM
4753
coderay (1.1.3)
4854
concurrent-ruby (1.1.7)
4955
crass (1.0.6)
56+
date (3.2.2)
5057
diff-lcs (1.4.4)
5158
erubis (2.7.0)
5259
i18n (1.8.5)
@@ -56,7 +63,12 @@ GEM
5663
nokogiri (>= 1.5.9)
5764
method_source (1.0.0)
5865
mini_portile2 (2.5.1)
59-
minitest (5.14.2)
66+
minitest (5.14.3)
67+
net-ftp (0.1.3)
68+
net-protocol
69+
time
70+
net-protocol (0.1.3)
71+
timeout
6072
nokogiri (1.11.3)
6173
mini_portile2 (~> 2.5.0)
6274
racc (~> 1.4)
@@ -127,6 +139,9 @@ GEM
127139
sqlite3 (1.3.13)
128140
thor (1.0.1)
129141
thread_safe (0.3.6)
142+
time (0.2.0)
143+
date
144+
timeout (0.2.0)
130145
tzinfo (1.2.7)
131146
thread_safe (~> 0.1)
132147
unicode-display_width (1.7.0)
@@ -138,10 +153,11 @@ PLATFORMS
138153
DEPENDENCIES
139154
activerecord (~> 5.0.0)
140155
activerecord-jdbcsqlite3-adapter
141-
appraisal
156+
appraisal!
142157
childprocess
143158
climate_control
144159
jdbc-sqlite3
160+
net-ftp
145161
pry-byebug
146162
pry-nav
147163
railties (~> 5.0.0)

0 commit comments

Comments
 (0)