Merge pull request #538 from seanpdoyle/import-stream-actions

Fix System Tests in CI environment
hotwired · Dec 14, 2023 · 75b25b5 · 75b25b5
2 parents 4eb4e92 + 3011025
commit 75b25b5
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: [ "6.1", "7.0" ]
+        rails: [ "6.1", "7.0", "7.1" ]
         ruby: [ "2.7", "3.0", "3.1", "3.2" ]
         allow-fail: [ false ]
         include:

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-rails_version = ENV.fetch("RAILS_VERSION", "6.1")
+rails_version = ENV.fetch("RAILS_VERSION", "7.1")
 
 if rails_version == "main"
   rails_constraint = { github: "rails/rails" }

diff --git a/app/assets/javascripts/turbo.js b/app/assets/javascripts/turbo.js
@@ -4810,7 +4810,7 @@ window.Turbo = Turbo;
 
 start();
 
-var turbo_es2017Esm = Object.freeze({
+var Turbo$1 = Object.freeze({
   __proto__: null,
   FetchEnctype: FetchEnctype,
   FetchMethod: FetchMethod,
@@ -4979,6 +4979,8 @@ function isBodyInit(body) {
   return body instanceof FormData || body instanceof URLSearchParams;
 }
 
+window.Turbo = Turbo$1;
+
 addEventListener("turbo:before-fetch-request", encodeMethodIntoRequestBody);
 
 var adapters = {
@@ -5514,4 +5516,4 @@ var index = Object.freeze({
   getConfig: getConfig
 });
 
-export { turbo_es2017Esm as Turbo, cable };
+export { Turbo$1 as Turbo, cable };
diff --git a/app/assets/javascripts/turbo.min.js b/app/assets/javascripts/turbo.min.js
diff --git a/app/assets/javascripts/turbo.min.js.map b/app/assets/javascripts/turbo.min.js.map
diff --git a/app/javascript/turbo/index.js b/app/javascript/turbo/index.js
@@ -8,4 +8,6 @@ export { cable }
 
 import { encodeMethodIntoRequestBody } from "./fetch_requests"
 
+window.Turbo = Turbo
+
 addEventListener("turbo:before-fetch-request", encodeMethodIntoRequestBody)
diff --git a/app/jobs/turbo/streams/broadcast_job.rb b/app/jobs/turbo/streams/broadcast_job.rb
@@ -2,7 +2,7 @@
 # turbo stream templates.
 class Turbo::Streams::BroadcastJob < ActiveJob::Base
   discard_on ActiveJob::DeserializationError
-  
+
   def perform(stream, **rendering)
     Turbo::StreamsChannel.broadcast_render_to stream, **rendering
   end

diff --git a/test/dummy/app/models/message.rb b/test/dummy/app/models/message.rb
@@ -1,5 +1,3 @@
 class Message < ApplicationRecord
-  def to_s
-    content
-  end
+  delegate :to_s, to: :content, allow_nil: true
 end
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
@@ -12,7 +12,12 @@
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults (
+      case (rails_version = ENV["RAILS_VERSION"])
+      when "main", nil then 7.1
+      else rails_version.to_f
+      end
+    )
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

diff --git a/yarn.lock b/yarn.lock
@@ -206,9 +206,9 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-"idiomorph@git+https://github.com/basecamp/idiomorph.git#rollout-build":
+"idiomorph@https://github.com/basecamp/idiomorph#rollout-build":
   version "0.0.8"
-  resolved "git+https://github.com/basecamp/idiomorph.git#e906820368e4c9c52489a3336b8c3826b1bf6de5"
+  resolved "https://github.com/basecamp/idiomorph#e906820368e4c9c52489a3336b8c3826b1bf6de5"
 
 is-core-module@^2.13.0:
   version "2.13.1"