From bf525f35009d56c39a8a5b5762aab43f22d07fc4 Mon Sep 17 00:00:00 2001
From: Pedro Furtado <pedro.felipe.azevedo.furtado@gmail.com>
Date: Tue, 17 Aug 2021 10:19:56 -0300
Subject: [PATCH] [5.x] CI fixes (#3106)

* Update ruby.yml

* Update Gemfile-rails-edge

* Update helper_test.rb
---
 .github/workflows/ruby.yml  |  8 --------
 gemfiles/Gemfile-rails-edge |  2 +-
 test/helper_test.rb         | 30 +++++++++++++++++++++---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 2ec02de4e..01c38d528 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -29,14 +29,6 @@ jobs:
             gemfile: gemfiles/Gemfile-rails.6.0.x
         experimental: [false]
         include:
-          - ruby: 2.5
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
           - ruby: 2.7
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
diff --git a/gemfiles/Gemfile-rails-edge b/gemfiles/Gemfile-rails-edge
index 9b5c32d7e..c096ad2d7 100644
--- a/gemfiles/Gemfile-rails-edge
+++ b/gemfiles/Gemfile-rails-edge
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: "../"
 
-gem "rails", github: "rails/rails"
+gem "rails", github: "rails/rails", branch: "main"
 gem "arel", github: "rails/arel"
 gem "rake", ">= 11.1"
 gem "rack-proxy", require: false
diff --git a/test/helper_test.rb b/test/helper_test.rb
index d2eca7d1b..116127e71 100644
--- a/test/helper_test.rb
+++ b/test/helper_test.rb
@@ -117,29 +117,41 @@ def test_preload_pack_asset
   end
 
   def test_stylesheet_pack_tag_split_chunks
-    assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
+    assert_equal stylesheet_packs_with_chunks_tag("application", "hello_stimulus").in?([
+        %(<link rel="stylesheet" href="/packs/1-c20632e7baf2c81200d3.chunk.css" media="screen" />\n) +
+        %(<link rel="stylesheet" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" media="screen" />\n) +
+        %(<link rel="stylesheet" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" media="screen" />),
+
+        %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
         %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
         %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_packs_with_chunks_tag("application", "hello_stimulus")
+      ]),
+      true
   end
 
   def test_stylesheet_pack_tag
-    assert_equal \
+    assert_equal stylesheet_pack_tag("bootstrap.css").in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
+
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag("bootstrap.css")
+    ]), true
   end
 
   def test_stylesheet_pack_tag_symbol
-    assert_equal \
+    assert_equal stylesheet_pack_tag(:bootstrap).in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
+
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag(:bootstrap)
+    ]), true
   end
 
   def test_stylesheet_pack_tag_splat
-    assert_equal \
+    assert_equal stylesheet_pack_tag("bootstrap.css", "application.css", media: "all").in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="all" />\n) +
+        %(<link rel="stylesheet" href="/packs/application-dd6b1cd38bfa093df600.css" media="all" />),
+
       %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
         %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
-      stylesheet_pack_tag("bootstrap.css", "application.css", media: "all")
+    ]), true
   end
 end