Skip to content

Commit d511243

Browse files
dwelch-r7dwelch-r7
committed
Rails 7.1 upgrade tests
1 parent 992b01b commit d511243

15 files changed

+60
-46
lines changed

‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
timeout-minutes: 60
3636

3737
strategy:
38-
fail-fast: true
38+
fail-fast: false
3939
matrix:
4040
ruby:
4141
- '3.0'

‎.github/workflows/ldap_acceptance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
timeout-minutes: 60
4848

4949
strategy:
50-
fail-fast: true
50+
fail-fast: false
5151
matrix:
5252
ruby:
5353
- '3.2'

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
BUNDLE_WITHOUT: "coverage development pcap"
3636

3737
strategy:
38-
fail-fast: true
38+
fail-fast: false
3939
matrix:
4040
ruby:
4141
- '3.2'

‎.github/workflows/mssql_acceptance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
--health-timeout 5s
6060
--health-retries 5
6161
strategy:
62-
fail-fast: true
62+
fail-fast: false
6363
matrix:
6464
ruby:
6565
- '3.2'

‎.github/workflows/mysql_acceptance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
--health-timeout 10s
5959
--health-retries 5
6060
strategy:
61-
fail-fast: true
61+
fail-fast: false
6262
matrix:
6363
ruby:
6464
- '3.2'

‎.github/workflows/postgres_acceptance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
--health-retries 5
6161
6262
strategy:
63-
fail-fast: true
63+
fail-fast: false
6464
matrix:
6565
ruby:
6666
- '3.2'

‎.github/workflows/shared_smb_acceptance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
timeout-minutes: 60
2121

2222
strategy:
23-
fail-fast: true
23+
fail-fast: false
2424
matrix:
2525
ruby:
2626
- '3.2'

‎.github/workflows/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
--health-retries 5
5858
5959
strategy:
60-
fail-fast: true
60+
fail-fast: false
6161
matrix:
6262
ruby:
6363
- '3.2'

‎.github/workflows/weekly-data-and-external-tool-updater.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
BUNDLE_WITHOUT: "coverage development pcap"
3333

3434
strategy:
35-
fail-fast: true
35+
fail-fast: false
3636
matrix:
3737
ruby:
3838
- '3.2'

‎Gemfile.lock

+47-27
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ PATH
44
metasploit-framework (6.4.53)
55
aarch64
66
abbrev
7-
actionpack (~> 7.0.0)
8-
activerecord (~> 7.0.0)
9-
activesupport (~> 7.0.0)
7+
actionpack (~> 7.1.5.1)
8+
activerecord (~> 7.1.5.1)
9+
activesupport (~> 7.1.5.1)
1010
aws-sdk-ec2
1111
aws-sdk-ec2instanceconnect
1212
aws-sdk-iam
@@ -122,28 +122,40 @@ GEM
122122
aarch64 (2.1.0)
123123
racc (~> 1.6)
124124
abbrev (0.1.2)
125-
actionpack (7.0.8.6)
126-
actionview (= 7.0.8.6)
127-
activesupport (= 7.0.8.6)
128-
rack (~> 2.0, >= 2.2.4)
125+
actionpack (7.1.5.1)
126+
actionview (= 7.1.5.1)
127+
activesupport (= 7.1.5.1)
128+
nokogiri (>= 1.8.5)
129+
racc
130+
rack (>= 2.2.4)
131+
rack-session (>= 1.0.1)
129132
rack-test (>= 0.6.3)
130-
rails-dom-testing (~> 2.0)
131-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
132-
actionview (7.0.8.6)
133-
activesupport (= 7.0.8.6)
133+
rails-dom-testing (~> 2.2)
134+
rails-html-sanitizer (~> 1.6)
135+
actionview (7.1.5.1)
136+
activesupport (= 7.1.5.1)
134137
builder (~> 3.1)
135-
erubi (~> 1.4)
136-
rails-dom-testing (~> 2.0)
137-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
138-
activemodel (7.0.8.6)
139-
activesupport (= 7.0.8.6)
140-
activerecord (7.0.8.6)
141-
activemodel (= 7.0.8.6)
142-
activesupport (= 7.0.8.6)
143-
activesupport (7.0.8.6)
138+
erubi (~> 1.11)
139+
rails-dom-testing (~> 2.2)
140+
rails-html-sanitizer (~> 1.6)
141+
activemodel (7.1.5.1)
142+
activesupport (= 7.1.5.1)
143+
activerecord (7.1.5.1)
144+
activemodel (= 7.1.5.1)
145+
activesupport (= 7.1.5.1)
146+
timeout (>= 0.4.0)
147+
activesupport (7.1.5.1)
148+
base64
149+
benchmark (>= 0.3)
150+
bigdecimal
144151
concurrent-ruby (~> 1.0, >= 1.0.2)
152+
connection_pool (>= 2.2.5)
153+
drb
145154
i18n (>= 1.6, < 2)
155+
logger (>= 1.4.2)
146156
minitest (>= 5.1)
157+
mutex_m
158+
securerandom (>= 0.3)
147159
tzinfo (~> 2.0)
148160
addressable (2.8.7)
149161
public_suffix (>= 2.0.2, < 7.0)
@@ -201,6 +213,7 @@ GEM
201213
chunky_png (1.4.0)
202214
coderay (1.1.3)
203215
concurrent-ruby (1.3.4)
216+
connection_pool (2.5.0)
204217
cookiejar (0.3.4)
205218
crass (1.0.6)
206219
csv (3.3.0)
@@ -287,7 +300,7 @@ GEM
287300
systemu (~> 2.6.5)
288301
memory_profiler (1.1.0)
289302
metasm (1.0.5)
290-
metasploit-concern (5.0.3)
303+
metasploit-concern (5.0.4)
291304
activemodel (~> 7.0)
292305
activesupport (~> 7.0)
293306
railties (~> 7.0)
@@ -387,22 +400,28 @@ GEM
387400
rack-protection (3.2.0)
388401
base64 (>= 0.1.0)
389402
rack (~> 2.2, >= 2.2.4)
403+
rack-session (1.0.2)
404+
rack (< 3)
390405
rack-test (2.1.0)
391406
rack (>= 1.3)
407+
rackup (1.0.1)
408+
rack (< 3)
409+
webrick
392410
rails-dom-testing (2.2.0)
393411
activesupport (>= 5.0.0)
394412
minitest
395413
nokogiri (>= 1.6)
396414
rails-html-sanitizer (1.6.0)
397415
loofah (~> 2.21)
398416
nokogiri (~> 1.14)
399-
railties (7.0.8.6)
400-
actionpack (= 7.0.8.6)
401-
activesupport (= 7.0.8.6)
402-
method_source
417+
railties (7.1.5.1)
418+
actionpack (= 7.1.5.1)
419+
activesupport (= 7.1.5.1)
420+
irb
421+
rackup (>= 1.0.0)
403422
rake (>= 12.2)
404-
thor (~> 1.0)
405-
zeitwerk (~> 2.5)
423+
thor (~> 1.0, >= 1.2.2)
424+
zeitwerk (~> 2.6)
406425
rainbow (3.1.1)
407426
rake (13.2.1)
408427
rasn1 (0.14.0)
@@ -519,6 +538,7 @@ GEM
519538
sawyer (0.9.2)
520539
addressable (>= 2.3.5)
521540
faraday (>= 0.17.3, < 3)
541+
securerandom (0.4.1)
522542
simplecov (0.18.2)
523543
docile (~> 1.1)
524544
simplecov-html (~> 0.11)

‎config/application.rb

-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ class Application < Rails::Application
4949
when "production"
5050
config.eager_load = false
5151
end
52-
53-
if ActiveRecord.respond_to?(:legacy_connection_handling=)
54-
ActiveRecord.legacy_connection_handling = false
55-
end
5652
end
5753
end
5854
end

‎db/schema.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema[7.0].define(version: 2022_12_09_005658) do
13+
ActiveRecord::Schema[7.1].define(version: 2022_12_09_005658) do
1414
# These are extensions that must be enabled in order to support this database
1515
enable_extension "plpgsql"
1616

‎lib/metasploit/framework/common_engine.rb

-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ module Metasploit::Framework::CommonEngine
4040

4141
config.active_support.deprecation = :stderr
4242

43-
if ActiveRecord.respond_to?(:legacy_connection_handling=)
44-
ActiveRecord.legacy_connection_handling = false
45-
end
46-
4743
# @see https://github.com/rapid7/metasploit_data_models/blob/54a17149d5ccd0830db742d14c4987b48399ceb7/lib/metasploit_data_models/yaml.rb#L10
4844
# @see https://github.com/rapid7/metasploit_data_models/blob/54a17149d5ccd0830db742d14c4987b48399ceb7/lib/metasploit_data_models/base64_serializer.rb#L28-L31
4945
ActiveRecord.yaml_column_permitted_classes = (ActiveRecord.yaml_column_permitted_classes + MetasploitDataModels::YAML::PERMITTED_CLASSES).uniq

‎lib/metasploit/framework/rails_version_constraint.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module Metasploit
44
module Framework
55
module RailsVersionConstraint
6-
RAILS_VERSION = '~> 7.0.0'
6+
RAILS_VERSION = '~> 7.1.5.1'
77
end
88
end
99
end

‎spec/allure_config.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
require "allure-rspec"
2+
require "active_support"
3+
require "active_support/core_ext/object"
24

35
AllureRspec.configure do |config|
46
config.results_directory = "tmp/allure-raw-data"

0 commit comments

Comments
 (0)