diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52846f1f..07c76acc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,13 +5,17 @@ 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.7", "3.0", "3.1", "3.2", "3.3" ] allow-fail: [ false ] include: + - { ruby: "2.6", rails: "6.1" } - { 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.7", rails: "7.2" } + - { ruby: "3.0", rails: "7.2" } env: FERRUM_PROCESS_TIMEOUT: 25 @@ -33,6 +37,7 @@ jobs: - name: Run Bug Template Tests run: ruby bug_report_template.rb || ruby bug_report_template.rb + continue-on-error: ${{ startsWith(matrix.ruby, "2") || false }} - name: Run tests id: test diff --git a/Gemfile b/Gemfile index fe6844ae..dd8f544c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec -rails_version = ENV.fetch("RAILS_VERSION", "7.1") +rails_version = ENV.fetch("RAILS_VERSION", "7.2") if rails_version == "main" rails_constraint = { github: "rails/rails" } diff --git a/test/streams/streams_helper_test.rb b/test/streams/streams_helper_test.rb index be9bea9f..45d66429 100644 --- 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