From: Tom Hughes Date: Tue, 28 Nov 2023 18:37:48 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4373' X-Git-Tag: live~1412 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c63ae5ab6c5c5e2ee2e2ec7f984f939a2f7d0d22?hp=04b839c3017e90217ba73d89f1b98cfb7dfdef1c Merge remote-tracking branch 'upstream/pull/4373' --- diff --git a/Gemfile.lock b/Gemfile.lock index 885de22b4..ec0ec403f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,23 +92,23 @@ GEM ffi (~> 1.15) ffi-compiler (~> 1.0) ast (2.4.2) - autoprefixer-rails (10.4.15.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) - aws-eventstream (1.2.0) - aws-partitions (1.854.0) - aws-sdk-core (3.187.1) + aws-eventstream (1.3.0) + aws-partitions (1.859.0) + aws-sdk-core (3.188.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.73.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.137.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.140.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (1.7.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) better_errors (2.10.1) @@ -177,7 +177,7 @@ GEM activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) docile (1.4.0) - doorkeeper (5.6.6) + doorkeeper (5.6.7) railties (>= 5) doorkeeper-i18n (5.2.7) doorkeeper (>= 5.2) @@ -228,10 +228,10 @@ GEM erubi (1.12.0) execjs (2.9.1) exifr (1.4.0) - factory_bot (6.2.1) + factory_bot (6.4.2) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.2) + factory_bot (~> 6.4) railties (>= 5.0.0) faraday (2.7.12) base64 @@ -334,7 +334,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) mutex_m (0.2.0) - net-imap (0.4.5) + net-imap (0.4.6) date net-protocol net-pop (0.1.2) @@ -467,7 +467,7 @@ GEM rdoc (6.6.0) psych (>= 4.0.0) regexp_parser (2.8.2) - reline (0.4.0) + reline (0.4.1) io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) @@ -544,12 +544,12 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - stringio (3.0.9) + stringio (3.1.0) strong_migrations (1.6.4) activerecord (>= 5.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - terser (1.1.19) + terser (1.1.20) execjs (>= 0.3.0, < 3) thor (1.3.0) tilt (2.3.0) diff --git a/config/environments/test.rb b/config/environments/test.rb index 08d3236bf..80871151f 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -67,4 +67,7 @@ Rails.application.configure do # Use the test adapter for ActiveJob during testing. config.active_job.queue_adapter = :test + + # Allow FactoryBot to set primary key attributes + config.factory_bot.reject_primary_key_attributes = false end diff --git a/test/controllers/oauth2_authorizations_controller_test.rb b/test/controllers/oauth2_authorizations_controller_test.rb index 19bc79808..43fbe4df4 100644 --- a/test/controllers/oauth2_authorizations_controller_test.rb +++ b/test/controllers/oauth2_authorizations_controller_test.rb @@ -77,7 +77,7 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => "https://bad.example.com/", :response_type => "code", :scope => "write_api") - assert_response :success + assert_response :bad_request assert_template "oauth2_authorizations/error" assert_select "p", "The requested redirect uri is malformed or doesn't match client redirect URI." end @@ -91,7 +91,7 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => application.redirect_uri, :response_type => "code", :scope => "bad_scope") - assert_response :success + assert_response :bad_request assert_template "oauth2_authorizations/error" assert_select "p", "The requested scope is invalid, unknown, or malformed." @@ -99,7 +99,7 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => application.redirect_uri, :response_type => "code", :scope => "write_prefs") - assert_response :success + assert_response :bad_request assert_template "oauth2_authorizations/error" assert_select "p", "The requested scope is invalid, unknown, or malformed." end diff --git a/yarn.lock b/yarn.lock index b1d4b6451..a63202522 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,10 +34,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.53.0": - version "8.53.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d" - integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w== +"@eslint/js@8.54.0": + version "8.54.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf" + integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ== "@humanwhocodes/config-array@^0.11.13": version "0.11.13" @@ -229,14 +229,14 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.0.0: - version "8.53.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce" - integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag== + version "8.54.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537" + integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.3" - "@eslint/js" "8.53.0" + "@eslint/js" "8.54.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8"