From 494d569955b221313944a2461305c8f47fc07dd0 Mon Sep 17 00:00:00 2001 From: Sean Doyle Date: Wed, 18 Sep 2024 19:13:30 -0400 Subject: [PATCH] Commit to `ruby@2.6` support Closes [#681][] First, remove `ruby@3.0` syntax including `...` arguments and end-less method definitions. Next, add `ruby@2.6` and `ruby@2.7` to the CI matrix along with `rails@7.1`. [#681]: https://github.com/hotwired/turbo-rails/issues/681 --- .github/workflows/ci.yml | 4 ++-- test/streams/streams_helper_test.rb | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52846f1f..c63d4882 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ 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 } diff --git a/test/streams/streams_helper_test.rb b/test/streams/streams_helper_test.rb index be9bea9f..418cc532 100644 --- a/test/streams/streams_helper_test.rb +++ b/test/streams/streams_helper_test.rb @@ -3,12 +3,16 @@ class TestChannel < ApplicationCable::Channel; end class Turbo::StreamsHelperTest < ActionView::TestCase - class Component + Component = Struct.new(:id, :content) do extend ActiveModel::Naming - def initialize(id:, content:) = (@id, @content = id, content) - def render_in(...) = @content - def to_key = [@id] + def render_in(view_context) + content + end + + def to_key + [id] + end end attr_accessor :formats