diff --git a/.rubocop.yml b/.rubocop.yml index 922ea32681a..506b0dd6a79 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -223,6 +223,11 @@ Lint/AmbiguousOperator: Lint/AmbiguousRegexpLiteral: Enabled: true +Lint/Debugger: + Enabled: true + DebuggerRequires: + - debug + Lint/DuplicateRequire: Enabled: true diff --git a/Gemfile.lock b/Gemfile.lock index 37737c688a1..dc3e85540fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -371,7 +371,7 @@ GEM racc (~> 1.4) os (1.1.4) parallel (1.24.0) - parser (3.2.2.4) + parser (3.3.1.0) ast (~> 2.4.1) racc path_expander (1.1.1) @@ -444,19 +444,19 @@ GEM retriable (3.1.2) rexml (3.2.6) rouge (4.2.0) - rubocop (1.59.0) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-md (1.2.2) rubocop (>= 1.0) rubocop-minitest (0.34.3) diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb index 46c896f44a0..5c1404c32fc 100644 --- a/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb +++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb @@ -107,6 +107,7 @@ module ActionDispatch "#{absolute_path}.html" end + # rubocop:disable Lint/Debugger def save_html page.save_page(absolute_html_path) end @@ -114,6 +115,7 @@ module ActionDispatch def save_image page.save_screenshot(absolute_image_path) end + # rubocop:enable Lint/Debugger def output_type # Environment variables have priority diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 5d4d4267beb..17af1c906d2 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -1309,6 +1309,7 @@ class IntegrationFileUploadTest < ActionDispatch::IntegrationTest end end +# rubocop:disable Lint/Debugger class PageDumpIntegrationTest < ActionDispatch::IntegrationTest class FooController < ActionController::Base def index @@ -1392,3 +1393,4 @@ class PageDumpIntegrationTest < ActionDispatch::IntegrationTest end end end +# rubocop:enable Lint/Debugger