Commit to [email protected] support

Closes [hotwired#681][] First, remove `[email protected]` syntax including `...` arguments and end-less method definitions. Next, add `[email protected]` and `[email protected]` to the CI matrix along with `[email protected]`. [hotwired#681]: hotwired#681
seanpdoyle · Sep 18, 2024 · 36cdf45 · 36cdf45
1 parent 780ee0d
commit 36cdf45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,13 +5,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: [ "6.1", "7.0", "7.1" ]
-        ruby: [ "3.0", "3.1", "3.2", "3.3" ]
+        rails: [ "6.1", "7.0", "7.1", "7.2" ]
+        ruby: [ "2.6", "2.7", "3.0", "3.1", "3.2", "3.3" ]
         allow-fail: [ false ]
         include:
           - { ruby: "3.3",  rails: "main", allow-fail: true }
           - { ruby: "3.2",  rails: "main", allow-fail: true }
           - { ruby: "head", rails: "main", allow-fail: true }
+        exclude:
+          - { ruby: "2.6", rails: "7.0" }
+          - { ruby: "2.6", rails: "7.1" }
+          - { ruby: "2.6", rails: "7.2" }
+          - { ruby: "2.7", rails: "7.2" }
+          - { ruby: "3.0", rails: "7.2" }
 
     env:
       FERRUM_PROCESS_TIMEOUT: 25

diff --git a/test/streams/streams_helper_test.rb b/test/streams/streams_helper_test.rb
@@ -4,11 +4,17 @@ class TestChannel < ApplicationCable::Channel; end
 
 class Turbo::StreamsHelperTest < ActionView::TestCase
   class Component
-    extend ActiveModel::Naming
+    include ActiveModel::Model
 
-    def initialize(id:, content:) = (@id, @content = id, content)
-    def render_in(...) = @content
-    def to_key = [@id]
+    attr_accessor :id, :content
+
+    def render_in(view_context)
+      content
+    end
+
+    def to_key
+      [id]
+    end
   end
 
   attr_accessor :formats