Merge pull request #5749 from dodona-edu/dependabot/npm_and_yarn/rail…

…s-61eaf265a0 Bump the rails group across 1 directory with 2 updates
dodona-edu · Sep 4, 2024 · b15ad64 · b15ad64
2 parents 7c87cc3 + 297b825
commit b15ad64
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -28,8 +28,8 @@
     "@lezer/highlight": "^1.2.1",
     "@lezer/lr": "^1.4.2",
     "@popperjs/core": "^2.11.8",
-    "@rails/activestorage": "^7.1.3",
-    "@rails/ujs": "^7.1.3",
+    "@rails/activestorage": "^7.2.100",
+    "@rails/ujs": "^7.1.400",
     "@replit/codemirror-lang-csharp": "^6.2.0",
     "@sentry/browser": "^8.26.0",
     "@sentry/webpack-plugin": "^2.22.2",

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
@@ -40,6 +40,8 @@ def dump_js_coverage
   config.default_max_wait_time = 10
 end
 
+Capybara.threadsafe = true
+
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :chrome
 

diff --git a/test/system/scratchpad_test.rb b/test/system/scratchpad_test.rb
@@ -35,7 +35,7 @@ def codemirror_send_keys(parent, code)
   # Set code in the editor and run it
   def run_code(code)
     codemirror_send_keys(find_by_id('scratchpad-editor-wrapper'), code)
-    find_button('__papyros-run-code-btn', disabled: false).click
+    find_button('__papyros-run-code-btn', disabled: false, wait: 20).click
   end
 
   test 'Scratchpad can run code' do

diff --git a/test/system/search_test.rb b/test/system/search_test.rb
@@ -59,7 +59,7 @@ def assert_path_with_query(path, **query_params)
     click_on 'Toggle drawer'
     click_on 'Exercises'
 
-    page.assert_current_path activities_path
+    page.assert_current_path activities_path, ignore_query: true
     page.go_back
 
     page.assert_current_path root_path

diff --git a/yarn.lock b/yarn.lock
@@ -2049,17 +2049,17 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
-"@rails/activestorage@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.3.tgz#e83ece6c5fd94b3ddf30a8cf3b8f78cad049e596"
-  integrity sha512-B+RFYAU8vdTPFg0IJcRp2ey0Qw9hpcUOqHHcWqftDJ76ZMBi9+m/UUeMJlNsSd0l9eD+1HLlFSo1X//cY4yiDw==
+"@rails/activestorage@^7.2.100":
+  version "7.2.100"
+  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.2.100.tgz#c1e643d3c35c62c946e6f7c8d812fa567d2ce915"
+  integrity sha512-gohCilm1E10W51Hc9iT960xX9TP11L5TJ4W1ufs9f3h5Ncsw01S/eHgVUfcdfszqw3G+28Z0MFu999+iSpgdTg==
   dependencies:
     spark-md5 "^3.0.1"
 
-"@rails/ujs@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.3.tgz#6d94a68b7da5046147d31716e0c187a4ead4fb93"
-  integrity sha512-FxtgKNvvIonoBE1TK7U10VMf6CYvzq8SIZ1XZ1Q8zcn/BEXzPzid3zC9qFiojuI5WXVwWhO8GFqApq0stD+OqQ==
+"@rails/ujs@^7.1.400":
+  version "7.1.400"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.400.tgz#b2a76bdccb5197b9e866954536106386c87cfab5"
+  integrity sha512-YwvXm3BR5tn+VCAKYGycLejMRVZE3Ionj5gFjEeGXCZnI0Rpi+7dKpmyu90kdUY7dRUFpHTdu9zZceEzFLl38w==
 
 "@replit/codemirror-lang-csharp@^6.2.0":
   version "6.2.0"