Rubocop for Ruby 3.3+

Author: jamescook

lib/cataract.rb

@@ -86,8 +86,8 @@ class << self
     #
     # @see Stylesheet#parse
     # @see Stylesheet.parse
-    def parse_css(css, **options)
-      Stylesheet.parse(css, **options)
+    def parse_css(css, **)
+      Stylesheet.parse(css, **)
     end
 
     # Flatten CSS rules according to CSS cascade rules.

test/flatten/test_shorthand_expansion.rb

@@ -221,17 +221,15 @@ def test_background_gradient_with_color
     decls = parse_and_flatten('.test { background: red linear-gradient(to right, rgba(255,255,255,0.5), transparent) }')
 
     # Should have both color and gradient
-    assert_match(/linear-gradient/, decls['background'])
-    assert_match(/red/, decls['background'])
+    assert_equal 'red linear-gradient(to right, rgba(255,255,255,0.5), transparent)', decls['background']
   end
 
   def test_background_multiple_gradients
     # Multiple gradients (layered backgrounds)
     decls = parse_and_flatten('.test { background: linear-gradient(#fff, #000), radial-gradient(circle, red, blue) }')
 
     # Should preserve both gradients
-    assert_match(/linear-gradient/, decls['background'])
-    assert_match(/radial-gradient/, decls['background'])
+    assert_equal 'linear-gradient(#fff, #000), radial-gradient(circle, red, blue)', decls['background']
   end
 
   # Layered backgrounds are comma-separated and reach the expander one part per

test/parse/test_import_statement.rb

@@ -267,7 +267,6 @@ def test_import_statement_as_hash_key
 
   def test_import_statement_in_set
     # Test that ImportStatements work in Sets (requires proper hash/eql?)
-    require 'set'
 
     import1 = Cataract::ImportStatement.make(id: 0, url: 'styles.css', media: 'screen')
     import2 = Cataract::ImportStatement.make(id: 99, url: 'styles.css', media: 'screen', resolved: true) # Equal to import1

test/serialization/test_media_query_list_serialization.rb

@@ -177,16 +177,17 @@ def test_to_s_with_media_filter_preserves_list_when_applicable
     css = '@media screen, print { body { color: red; } } @media handheld { p { margin: 0; } }'
     sheet = Cataract::Stylesheet.parse(css)
 
-    # When filtering to :screen, should only output the screen rule
-    # But since original was "screen, print", we might serialize as just "@media screen"
-    # This is acceptable - we only preserve the list when ALL members are included
     output = sheet.to_s(media: :screen)
+    reparsed = Cataract::Stylesheet.parse(output)
 
-    # Should contain screen rule but NOT handheld
-    assert_match(/@media screen/, output)
-    assert_match(/body \{ color: red; \}/, output)
-    refute_match(/handheld/, output)
-    refute_match(/p \{ margin: 0; \}/, output)
+    # Filtering to :screen keeps the rule, and its "screen, print" list is
+    # carried through intact rather than narrowed to just the media asked for.
+    assert_has_selector 'body', reparsed, media: :screen
+    assert_has_selector 'body', reparsed, media: :print
+    assert_has_property({ color: 'red' }, reparsed.with_media(:screen).with_selector('body').first)
+
+    # The handheld rule is dropped entirely.
+    assert_empty reparsed.with_selector('p').to_a
   end
 
   def test_to_s_with_multiple_media_filter_preserves_list

test/support/color_conversion_test_helper.rb

@@ -18,9 +18,9 @@ module ColorConversionTestHelper
   #     from: :hex, to: :rgb
   #   )
   #   assert_equal 'rgb(255, 0, 0)', decls['background-color']
-  def convert_and_get_declarations(css, **options)
+  def convert_and_get_declarations(css, **)
     sheet = Cataract.parse_css(css)
-    sheet.convert_colors!(**options)
+    sheet.convert_colors!(**)
 
     # Flatten all rules to get final cascaded declarations
     flattened = sheet.flatten

test/test_rule.rb

@@ -176,8 +176,6 @@ def test_rules_as_hash_keys
   end
 
   def test_rules_in_set
-    require 'set'
-
     sheet1 = Cataract.parse_css('.box { margin: 10px; }')
     sheet2 = Cataract.parse_css('.box { margin-top: 10px; margin-right: 10px; margin-bottom: 10px; margin-left: 10px; }')
 
@@ -367,8 +365,6 @@ def test_selector_list_id_does_not_affect_hash
   end
 
   def test_selector_list_id_works_in_set
-    require 'set'
-
     decls = [Cataract::Declaration.new('color', 'red', false)]
 
     rule1 = Cataract::Rule.make(

test/test_stylesheet.rb

@@ -537,8 +537,6 @@ def test_stylesheets_as_hash_keys
   end
 
   def test_stylesheets_in_set
-    require 'set'
-
     sheet1 = Cataract.parse_css('.box { margin: 10px; }')
     sheet2 = Cataract.parse_css('.box { margin-top: 10px; margin-right: 10px; margin-bottom: 10px; margin-left: 10px; }')