Skip to content

Commit 8e71e0e

Browse files
authoredAug 9, 2023
Updated gems and fixed tests (#2472)
* Updated gems and fixed tests * Ran npx audit * Attempt to fix GH actions * Fix migrations GH action
1 parent 72417a0 commit 8e71e0e

File tree

6 files changed

+98
-51
lines changed

6 files changed

+98
-51
lines changed
 

‎.github/workflows/migrations.yml

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
5959
- name: Install gems from base commit and create data to be migrated
6060
env:
61+
NODE_OPTIONS: --openssl-legacy-provider
6162
OXT_DB_USER: postgres
6263
OXT_DB_PASS: postgres
6364
run: |

‎.github/workflows/tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- name: Test
4646
env:
4747
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
48+
NODE_OPTIONS: --openssl-legacy-provider
4849
OXT_DB_USER: postgres
4950
OXT_DB_PASS: postgres
5051
RAILS_ENV: test

‎Gemfile.lock

+32-26
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ GEM
8484
i18n (>= 0.7, < 2)
8585
minitest (~> 5.1)
8686
tzinfo (~> 1.1)
87-
addressable (2.8.0)
88-
public_suffix (>= 2.0.2, < 5.0)
87+
addressable (2.8.5)
88+
public_suffix (>= 2.0.2, < 6.0)
8989
aes_key_wrap (1.0.1)
9090
apipie-rails (0.5.15)
9191
rails (>= 4.1)
@@ -147,13 +147,15 @@ GEM
147147
activesupport (>= 3.0.0)
148148
uniform_notifier (~> 1.11)
149149
byebug (11.0.1)
150-
capybara (2.18.0)
150+
capybara (3.39.2)
151151
addressable
152+
matrix
152153
mini_mime (>= 0.1.3)
153-
nokogiri (>= 1.3.3)
154-
rack (>= 1.0.0)
155-
rack-test (>= 0.5.4)
156-
xpath (>= 2.0, < 4.0)
154+
nokogiri (~> 1.8)
155+
rack (>= 1.6.0)
156+
rack-test (>= 0.6.3)
157+
regexp_parser (>= 1.5, < 3.0)
158+
xpath (~> 3.2)
157159
capybara-screenshot (1.0.22)
158160
capybara (>= 1.0, < 4)
159161
launchy
@@ -167,8 +169,6 @@ GEM
167169
ssrf_filter (~> 1.0)
168170
cheat (1.3.3)
169171
pager (~> 1.0)
170-
childprocess (0.9.0)
171-
ffi (~> 1.0, >= 1.0.11)
172172
choice (0.2.0)
173173
chronic (0.10.2)
174174
chunky_png (1.3.11)
@@ -289,7 +289,7 @@ GEM
289289
faraday (>= 0.8)
290290
faraday_middleware (0.14.0)
291291
faraday (>= 0.7.4, < 1.0)
292-
ffi (1.15.3)
292+
ffi (1.15.5)
293293
fine_print (5.0.0)
294294
action_interceptor
295295
jquery-rails
@@ -401,14 +401,15 @@ GEM
401401
mini_mime (>= 0.1.1)
402402
marcel (1.0.2)
403403
maruku (0.7.3)
404+
matrix (0.4.2)
404405
method_source (0.8.2)
405406
mime-types (3.4.1)
406407
mime-types-data (~> 3.2015)
407408
mime-types-data (3.2022.0105)
408409
mimemagic (0.4.3)
409410
nokogiri (~> 1)
410411
rake
411-
mini_mime (1.1.2)
412+
mini_mime (1.1.5)
412413
mini_portile2 (2.8.4)
413414
mini_racer (0.6.2)
414415
libv8-node (~> 16.10.0.0)
@@ -420,12 +421,12 @@ GEM
420421
nenv (0.3.0)
421422
nifty-generators (0.4.6)
422423
nio4r (2.5.8)
423-
nokogiri (1.14.3)
424-
mini_portile2 (~> 2.8.0)
424+
nokogiri (1.15.3)
425+
mini_portile2 (~> 2.8.2)
425426
racc (~> 1.4)
426-
nokogiri (1.14.3-x86_64-darwin)
427+
nokogiri (1.15.3-x86_64-darwin)
427428
racc (~> 1.4)
428-
nokogiri (1.14.3-x86_64-linux)
429+
nokogiri (1.15.3-x86_64-linux)
429430
racc (~> 1.4)
430431
notiffany (0.1.1)
431432
nenv (~> 0.1)
@@ -515,7 +516,7 @@ GEM
515516
method_source (~> 0.8.1)
516517
slop (~> 3.4)
517518
psych (3.1.0)
518-
public_suffix (4.0.6)
519+
public_suffix (5.0.3)
519520
puma (5.6.4)
520521
nio4r (~> 2.0)
521522
puma_worker_killer (0.3.1)
@@ -525,7 +526,7 @@ GEM
525526
rack (2.2.8)
526527
rack-attack (5.4.2)
527528
rack (>= 1.0, < 3)
528-
rack-proxy (0.7.0)
529+
rack-proxy (0.7.6)
529530
rack
530531
rack-test (2.1.0)
531532
rack (>= 1.3)
@@ -556,8 +557,9 @@ GEM
556557
activesupport (>= 3.2)
557558
choice (~> 0.2.0)
558559
ruby-graphviz (~> 1.2)
559-
rails-html-sanitizer (1.4.4)
560-
loofah (~> 2.19, >= 2.19.1)
560+
rails-html-sanitizer (1.6.0)
561+
loofah (~> 2.21)
562+
nokogiri (~> 1.14)
561563
rails-settings-cached (2.0.3)
562564
rails (>= 4.2.0)
563565
request_store
@@ -598,6 +600,7 @@ GEM
598600
redis-store (>= 1.2, < 2)
599601
redis-store (1.6.0)
600602
redis (>= 2.2, < 5)
603+
regexp_parser (2.8.1)
601604
remotipart (1.4.2)
602605
render_anywhere (0.0.12)
603606
rails (>= 3.0.7)
@@ -615,6 +618,7 @@ GEM
615618
faraday_middleware (>= 0.8.8, <= 2.0)
616619
hashie (>= 1.2.0, < 5.0)
617620
jwt (>= 1.5.6)
621+
rexml (3.2.6)
618622
roar (1.1.0)
619623
representable (~> 3.0.0)
620624
roar-rails (1.1.0)
@@ -677,9 +681,10 @@ GEM
677681
scout_apm (2.6.6)
678682
parser
679683
sd_notify (0.1.0)
680-
selenium-webdriver (3.141.0)
681-
childprocess (~> 0.5)
682-
rubyzip (~> 1.2, >= 1.2.2)
684+
selenium-webdriver (4.9.0)
685+
rexml (~> 3.2, >= 3.2.5)
686+
rubyzip (>= 1.2.2, < 3.0)
687+
websocket (~> 1.0)
683688
semantic_range (3.0.0)
684689
sentry-raven (2.9.0)
685690
faraday (>= 0.7.6, < 1.0)
@@ -739,19 +744,20 @@ GEM
739744
activemodel (>= 5.0)
740745
bindex (>= 0.4.0)
741746
railties (>= 5.0)
742-
webdrivers (4.1.2)
747+
webdrivers (5.3.1)
743748
nokogiri (~> 1.6)
744-
rubyzip (~> 1.0)
745-
selenium-webdriver (>= 3.0, < 4.0)
749+
rubyzip (>= 1.3.0)
750+
selenium-webdriver (~> 4.0, < 4.11)
746751
webmock (3.5.1)
747752
addressable (>= 2.3.6)
748753
crack (>= 0.3.2)
749754
hashdiff
750-
webpacker (5.4.3)
755+
webpacker (5.4.4)
751756
activesupport (>= 5.2)
752757
rack-proxy (>= 0.6.1)
753758
railties (>= 5.2)
754759
semantic_range (>= 2.3.0)
760+
websocket (1.2.9)
755761
websocket-driver (0.7.5)
756762
websocket-extensions (>= 0.1.0)
757763
websocket-extensions (0.1.5)

‎spec/features/admin/edit_course_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@
233233

234234
expect(student_1.reload).not_to be_is_comped
235235
expect(student_2.reload).to be_is_comped
236-
expect(page).to have_content(/Paid\?.*Comped\?.*Yes.*No.*No.*Yes/)
236+
expect(page).to have_content(/Paid\?.*Comped\?.*Yes.*No.*No.*Yes/m)
237237

238238
find('#best_in_place_course_membership_models_student_1_is_comped').click
239239
wait_for_ajax
240240

241241
expect(student_1.reload).to be_is_comped
242242
expect(student_2.reload).to be_is_comped
243-
expect(page).to have_content(/Paid\?.*Comped\?.*Yes.*Yes.*No.*Yes/)
243+
expect(page).to have_content(/Paid\?.*Comped\?.*Yes.*Yes.*No.*Yes/m)
244244

245245
first('#students tbody tr').click_link("11:59:59")
246246
wait_for_ajax

‎spec/features/research/cohorts_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
fill_in 'Name', with: 'AAA'
2020
click_button 'Save'
2121

22-
expect(page).to have_content(/Cohorts:.*AAA \/ 0 Members/)
22+
expect(page).to have_content(/Cohorts:.*AAA \/ 0 Members/m)
2323
end
2424
end
2525

‎yarn.lock

+61-22
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,46 @@
10541054
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
10551055
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
10561056

1057+
"@jridgewell/gen-mapping@^0.3.0":
1058+
version "0.3.3"
1059+
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
1060+
integrity "sha1-fgLm6135AartsIUUIDsJZhQCQJg= sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="
1061+
dependencies:
1062+
"@jridgewell/set-array" "^1.0.1"
1063+
"@jridgewell/sourcemap-codec" "^1.4.10"
1064+
"@jridgewell/trace-mapping" "^0.3.9"
1065+
1066+
"@jridgewell/resolve-uri@^3.1.0":
1067+
version "3.1.1"
1068+
resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
1069+
integrity "sha1-wIZ5Bj8nlhWjMmWDujqQ0dgsxyE= sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
1070+
1071+
"@jridgewell/set-array@^1.0.1":
1072+
version "1.1.2"
1073+
resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
1074+
integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
1075+
1076+
"@jridgewell/source-map@^0.3.3":
1077+
version "0.3.5"
1078+
resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
1079+
integrity "sha1-o7tNXGglqrDSgSaPR/atWFNDHpE= sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="
1080+
dependencies:
1081+
"@jridgewell/gen-mapping" "^0.3.0"
1082+
"@jridgewell/trace-mapping" "^0.3.9"
1083+
1084+
"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
1085+
version "1.4.15"
1086+
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
1087+
integrity "sha1-18bmdVx4VnqVHgSrUu8P0m3lnzI= sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
1088+
1089+
"@jridgewell/trace-mapping@^0.3.9":
1090+
version "0.3.19"
1091+
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
1092+
integrity "sha1-+KMkmGL5G+SNMSfDz+mS95tLiBE= sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw=="
1093+
dependencies:
1094+
"@jridgewell/resolve-uri" "^3.1.0"
1095+
"@jridgewell/sourcemap-codec" "^1.4.14"
1096+
10571097
"@npmcli/move-file@^1.0.1":
10581098
version "1.1.2"
10591099
resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -1307,6 +1347,11 @@ acorn@^6.4.1:
13071347
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
13081348
integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
13091349

1350+
acorn@^8.8.2:
1351+
version "8.10.0"
1352+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
1353+
integrity "sha1-i+WzkHpnIhqBqyPHiJxMVSa2LsU= sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
1354+
13101355
aggregate-error@^3.0.0:
13111356
version "3.1.0"
13121357
resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -1356,9 +1401,9 @@ ansi-regex@^2.0.0:
13561401
integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
13571402

13581403
ansi-regex@^4.1.0:
1359-
version "4.1.0"
1360-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
1361-
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
1404+
version "4.1.1"
1405+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
1406+
integrity "sha1-Fk2qyHqy1vbbOimHXi0XZlgtq+0= sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
13621407

13631408
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
13641409
version "3.2.1"
@@ -4022,11 +4067,9 @@ json5@^1.0.1:
40224067
minimist "^1.2.0"
40234068

40244069
json5@^2.1.2:
4025-
version "2.2.0"
4026-
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
4027-
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
4028-
dependencies:
4029-
minimist "^1.2.5"
4070+
version "2.2.3"
4071+
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
4072+
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
40304073

40314074
killable@^1.0.1:
40324075
version "1.0.1"
@@ -4090,9 +4133,9 @@ loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
40904133
json5 "^1.0.1"
40914134

40924135
loader-utils@^2.0.0:
4093-
version "2.0.0"
4094-
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
4095-
integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
4136+
version "2.0.4"
4137+
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
4138+
integrity "sha1-i1yzi1w0qaAY7h/A5qBm0d/MUow= sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="
40964139
dependencies:
40974140
big.js "^5.2.2"
40984141
emojis-list "^3.0.0"
@@ -6328,7 +6371,7 @@ source-map-resolve@^0.5.0:
63286371
source-map-url "^0.4.0"
63296372
urix "^0.1.0"
63306373

6331-
source-map-support@~0.5.12, source-map-support@~0.5.19:
6374+
source-map-support@~0.5.12, source-map-support@~0.5.20:
63326375
version "0.5.21"
63336376
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
63346377
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -6351,11 +6394,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
63516394
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
63526395
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
63536396

6354-
source-map@~0.7.2:
6355-
version "0.7.3"
6356-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
6357-
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
6358-
63596397
spdy-transport@^3.0.0:
63606398
version "3.0.0"
63616399
resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -6637,13 +6675,14 @@ terser@^4.1.2:
66376675
source-map-support "~0.5.12"
66386676

66396677
terser@^5.3.4:
6640-
version "5.6.0"
6641-
resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2"
6642-
integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==
6678+
version "5.19.2"
6679+
resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e"
6680+
integrity "sha1-vbgBeppKjeRmOnmD9FxQZTT5I04= sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="
66436681
dependencies:
6682+
"@jridgewell/source-map" "^0.3.3"
6683+
acorn "^8.8.2"
66446684
commander "^2.20.0"
6645-
source-map "~0.7.2"
6646-
source-map-support "~0.5.19"
6685+
source-map-support "~0.5.20"
66476686

66486687
through2@^2.0.0:
66496688
version "2.0.5"

0 commit comments

Comments
 (0)
Please sign in to comment.