Skip to content

Instantly share code, notes, and snippets.

@pvalena

pvalena/rubygem-sprockets-rails_update.log

Created February 1, 2023 13:39
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save pvalena/7026ad8090924aff6d6e31effa912256 to your computer and use it in GitHub Desktop.
Save pvalena/7026ad8090924aff6d6e31effa912256 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
rubygem-sprockets-rails_update.log
--> Please check the gem compare output bellow: !
NOTE: Gem::Specification#has_rdoc is deprecated with no replacement. It will be removed in Rubygems 4
Gem::Specification#has_rdoc called from /usr/share/gems/gems/gem-compare-0.0.7/lib/rubygems/comparator/utils.rb:112.
NOTE: Gem::Specification#has_rdoc is deprecated with no replacement. It will be removed in Rubygems 4
Gem::Specification#has_rdoc called from /usr/share/gems/gems/gem-compare-0.0.7/lib/rubygems/comparator/utils.rb:112.
Compared versions: ["3.2.2", "3.4.2"]
DIFFERENT required_ruby_version:
3.2.2: >= 1.9.3
3.4.2: >= 2.5
DIFFERENT runtime dependencies:
3.2.2->3.4.2:
* Updated:
actionpack from: [">= 4.0"] to: [">= 5.2"]
activesupport from: [">= 4.0"] to: [">= 5.2"]
DIFFERENT development dependencies:
3.2.2->3.4.2:
* Updated:
railties from: [">= 4.0"] to: [">= 5.2"]
commit 7d1aec625e099b727e38ffe420e231aea4349042
Author: Pavel Valena <pvalena@redhat.com>
Date: Fri Dec 3 04:39:33 2021 +0100
Update to sprockets-rails 3.4.2.
Resolves: rhbz#2022436
diff --git a/.gitignore b/.gitignore
index 9bef15a..5a93154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/sprockets-rails-*-tests.txz
/sprockets-rails-*.gem
+/sprockets-rails-*-tests.txz
diff --git a/rubygem-sprockets-rails-3.3.0-rails7-actionview.patch b/rubygem-sprockets-rails-3.3.0-rails7-actionview.patch
deleted file mode 100644
index d073093..0000000
--- a/rubygem-sprockets-rails-3.3.0-rails7-actionview.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-From 5fb466da6421daef086f1720e7961e348f5ce7c1 Mon Sep 17 00:00:00 2001
-From: Haroon Ahmed <haroon.ahmed25@gmail.com>
-Date: Sat, 19 Jun 2021 13:22:38 +0100
-Subject: [PATCH] Fixes build for Gemfile, rails 7 by adding a new method that
- checks the rails version and appends media="screen" to the assertions. The
- setting config.action_view.apply_stylesheet_media_default = true was added in
- rails 7.
-
-The method signature for ActionView::Base.new requires a couple of extra params which was also needed to get the build to pass.
----
- Gemfile | 2 +-
- test/test_helper.rb | 121 ++++++++++++++++++++++---------------------
- test/test_railtie.rb | 13 +++--
- 3 files changed, 73 insertions(+), 63 deletions(-)
-
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index eb92b9e3..8e680519 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -8,6 +8,12 @@
-
- ActiveSupport::TestCase.test_order = :random if ActiveSupport::TestCase.respond_to?(:test_order=)
-
-+def append_media_attribute
-+ if ::Rails::VERSION::MAJOR < 7
-+ "media=\"screen\""
-+ end
-+end
-+
- class HelperTest < ActionView::TestCase
- FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
-
-@@ -20,7 +26,7 @@ def setup
- tmp = File.expand_path("../../tmp", __FILE__)
- @manifest = Sprockets::Manifest.new(@assets, tmp)
-
-- @view = ActionView::Base.new(ActionView::LookupContext.new([]))
-+ @view = ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
- @view.extend ::Sprockets::Rails::Helper
- @view.assets_environment = @assets
- @view.assets_manifest = @manifest
-@@ -136,23 +142,23 @@ def test_javascript_include_tag
-
- def test_stylesheet_link_tag
- ActiveSupport::Deprecation.silence do
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static")
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static.css")
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:static)
-
-- assert_dom_equal %(<link href="/elsewhere.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/elsewhere.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("/elsewhere.css")
-- assert_dom_equal %(<link href="/style1.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/style2.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/style1.css" #{append_media_attribute} rel="stylesheet" />\n<link href="/stylesheets/style2.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("/style1.css", "style2.css")
-
-- assert_dom_equal %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="http://www.example.com/styles/style" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("http://www.example.com/styles/style")
-- assert_dom_equal %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="http://www.example.com/styles/style.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("http://www.example.com/styles/style.css")
-- assert_dom_equal %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="//www.example.com/styles/style.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("//www.example.com/styles/style.css")
-
- assert_dom_equal %(<link href="/stylesheets/print.css" media="print" rel="stylesheet" />),
-@@ -178,12 +184,12 @@ def test_javascript_include_tag_integrity
-
- def test_stylesheet_link_tag_integrity
- ActiveSupport::Deprecation.silence do
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" integrity="sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" integrity="sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=" />),
- @view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
-
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static", integrity: true)
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static", integrity: false)
- end
- end
-@@ -245,18 +251,18 @@ def test_javascript_include_tag_integrity
-
- def test_stylesheet_link_tag_integrity
- ActiveSupport::Deprecation.silence do
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static", integrity: true)
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static", integrity: false)
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static", integrity: nil)
-
-- assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
- end
-
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo", integrity: true)
- end
- end
-@@ -293,19 +299,19 @@ def test_javascript_include_tag_integrity
- def test_stylesheet_link_tag_integrity
- super
-
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo", integrity: false)
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo", integrity: nil)
-
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag("foo", integrity: true)
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag("foo.css", integrity: true)
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag(:foo, integrity: true)
-
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />\n<link href="/assets/bar.css" media="screen" rel="stylesheet" integrity="sha256-Vd370+VAW4D96CVpZcjFLXyeHoagI0VHwofmzRXetuE=" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />\n<link href="/assets/bar.css" #{append_media_attribute} rel="stylesheet" integrity="sha256-Vd370+VAW4D96CVpZcjFLXyeHoagI0VHwofmzRXetuE=" />),
- @view.stylesheet_link_tag(:foo, :bar, integrity: true)
- end
- end
-@@ -353,11 +359,11 @@ def test_stylesheet_path
- assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1#hash", @view.stylesheet_path("bank.css?foo=1#hash")
- end
-
-- assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo")
-- assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo.css")
-- assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
- end
-
-@@ -367,7 +373,6 @@ def test_asset_url
- end
- end
-
--
- class NoDigestHelperTest < NoHostHelperTest
- def setup
- super
-@@ -391,11 +396,11 @@ def test_javascript_include_tag
- def test_stylesheet_link_tag
- super
-
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo")
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo.css")
-- assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
-
- assert_servable_asset_url "/assets/foo.css"
-@@ -447,14 +452,14 @@ def test_javascript_include_tag
- def test_stylesheet_link_tag
- super
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo")
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo.css")
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />\n<link href="/assets/bar-#{@bar_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/bar-#{@bar_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo, :bar)
-
- assert_servable_asset_url "/assets/foo-#{@foo_css_digest}.css"
-@@ -482,19 +487,19 @@ def test_javascript_include_tag_integrity
- def test_stylesheet_link_tag_integrity
- super
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo", integrity: false)
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo", integrity: nil)
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag("foo", integrity: true)
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag("foo.css", integrity: true)
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag(:foo, integrity: true)
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />\n<link href="/assets/bar-#{@bar_css_digest}.css" media="screen" rel="stylesheet" integrity="sha256-Vd370+VAW4D96CVpZcjFLXyeHoagI0VHwofmzRXetuE=" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />\n<link href="/assets/bar-#{@bar_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="sha256-Vd370+VAW4D96CVpZcjFLXyeHoagI0VHwofmzRXetuE=" />),
- @view.stylesheet_link_tag(:foo, :bar, integrity: true)
- end
-
-@@ -565,11 +570,11 @@ def test_stylesheet_link_tag
- super
-
- if using_sprockets4?
-- assert_dom_equal %(<link href="/assets/foo.debug.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.debug.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
-- assert_dom_equal %(<link href="/assets/bar.debug.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/bar.debug.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:bar)
-- assert_dom_equal %(<link href="/assets/file1.debug.css" media="screen" rel="stylesheet" />\n<link href="/assets/file2.debug.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/file1.debug.css" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/file2.debug.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:file1, :file2)
-
- assert_servable_asset_url "/assets/foo.self.css"
-@@ -578,11 +583,11 @@ def test_stylesheet_link_tag
- assert_servable_asset_url "/assets/file1.self.css"
- assert_servable_asset_url "/assets/file2.self.css"
- else
-- assert_dom_equal %(<link href="/assets/foo.self.css?body=1" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.self.css?body=1" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
-- assert_dom_equal %(<link href="/assets/foo.self.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.self.css?body=1" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.self.css?body=1" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/bar.self.css?body=1" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:bar)
-- assert_dom_equal %(<link href="/assets/dependency.self.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.self.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.self.css?body=1" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/dependency.self.css?body=1" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/file1.self.css?body=1" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/file2.self.css?body=1" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:file1, :file2)
-
- assert_servable_asset_url "/assets/foo.self.css?body=1"
-@@ -652,11 +657,11 @@ def test_stylesheet_link_tag
- super
-
- if using_sprockets4?
-- assert_dom_equal %(<link href="/assets/foo.debug-#{@foo_debug_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.debug-#{@foo_debug_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
-- assert_dom_equal %(<link href="/assets/bar.debug-#{@bar_debug_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/bar.debug-#{@bar_debug_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:bar)
-- assert_dom_equal %(<link href="/assets/file1.debug-#{@file1_debug_css_digest}.css" media="screen" rel="stylesheet" />\n<link href="/assets/file2.debug-#{@file2_debug_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/file1.debug-#{@file1_debug_css_digest}.css" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/file2.debug-#{@file2_debug_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:file1, :file2)
-
- assert_servable_asset_url "/assets/foo.self-#{@foo_self_css_digest}.css"
-@@ -665,11 +670,11 @@ def test_stylesheet_link_tag
- assert_servable_asset_url "/assets/file1.self-#{@file1_self_css_digest}.css"
- assert_servable_asset_url "/assets/file2.self-#{@file2_self_css_digest}.css"
- else
-- assert_dom_equal %(<link href="/assets/foo.self-#{@foo_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.self-#{@foo_self_css_digest}.css?body=1" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
-- assert_dom_equal %(<link href="/assets/foo.self-#{@foo_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.self-#{@bar_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo.self-#{@foo_self_css_digest}.css?body=1" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/bar.self-#{@bar_self_css_digest}.css?body=1" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:bar)
-- assert_dom_equal %(<link href="/assets/dependency.self-#{@dependency_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.self-#{@file1_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.self-#{@file2_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/dependency.self-#{@dependency_self_css_digest}.css?body=1" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/file1.self-#{@file1_self_css_digest}.css?body=1" #{append_media_attribute} rel="stylesheet" />\n<link href="/assets/file2.self-#{@file2_self_css_digest}.css?body=1" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:file1, :file2)
-
- assert_servable_asset_url "/assets/foo.self-#{@foo_self_css_digest}.css?body=1"
-@@ -736,11 +741,11 @@ def test_javascript_include_tag
- def test_stylesheet_link_tag
- super
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo")
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag("foo.css")
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" />),
- @view.stylesheet_link_tag(:foo)
- end
-
-@@ -758,11 +763,11 @@ def test_javascript_include_tag_integrity
- def test_stylesheet_link_tag_integrity
- super
-
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag("foo", integrity: true)
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag("foo.css", integrity: true)
-- assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="#{@foo_css_integrity}" />),
-+ assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" #{append_media_attribute} rel="stylesheet" integrity="#{@foo_css_integrity}" />),
- @view.stylesheet_link_tag(:foo, integrity: true)
- end
-
-diff --git a/test/test_railtie.rb b/test/test_railtie.rb
-index a792b8b4..c24b2372 100644
---- a/test/test_railtie.rb
-+++ b/test/test_railtie.rb
-@@ -197,7 +197,7 @@ def test_gzip_config
- def test_default_check_precompiled_assets
- assert app.config.assets.check_precompiled_asset
- app.initialize!
-- @view = ActionView::Base.new
-+ @view = action_view
- assert @view.check_precompiled_asset
- end
-
-@@ -206,7 +206,7 @@ def test_configure_check_precompiled_assets
- config.assets.check_precompiled_asset = false
- end
- app.initialize!
-- @view = ActionView::Base.new
-+ @view = action_view
- refute @view.check_precompiled_asset
- end
-
-@@ -264,7 +264,7 @@ def test_action_view_helper
- assert_equal app.assets_manifest, ActionView::Base.assets_manifest
- assert_kind_of Sprockets::Environment, ActionView::Base.assets_environment
-
-- @view = ActionView::Base.new
-+ @view = action_view
- assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
- assert_equal "/assets/foo-4ef5541f349f7ed5a0d6b71f2fa4c82745ca106ae02f212aea5129726ac6f6ab.js", @view.javascript_path("foo")
-
-@@ -285,7 +285,7 @@ def test_action_view_helper_when_no_compile
- refute ActionView::Base.assets_environment
- assert_equal app.assets_manifest, ActionView::Base.assets_manifest
-
-- @view = ActionView::Base.new
-+ @view = action_view
- refute @view.assets_environment
- assert_equal app.assets_manifest, @view.assets_manifest
- end
-@@ -422,4 +422,9 @@ def test_quiet_assets_inserts_middleware
- assert middleware.include?(Sprockets::Rails::QuietAssets)
- assert middleware.each_cons(2).include?([Sprockets::Rails::QuietAssets, Rails::Rack::Logger])
- end
-+
-+ private
-+ def action_view
-+ ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
-+ end
- end
diff --git a/rubygem-sprockets-rails.spec b/rubygem-sprockets-rails.spec
index bd35d5b..2ad7335 100644
--- a/rubygem-sprockets-rails.spec
+++ b/rubygem-sprockets-rails.spec
@@ -2,18 +2,16 @@
%global gem_name sprockets-rails
Name: rubygem-%{gem_name}
-Version: 3.2.2
-Release: 7%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
Summary: Sprockets Rails integration
License: MIT
URL: https://github.com/rails/sprockets-rails
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Get the tests
# git clone --no-checkout https://github.com/rails/sprockets-rails.git
-# cd sprockets-rails && git archive -v -o sprockets-rails-3.2.2-tests.txz v3.2.2 test/
+# cd sprockets-rails && git archive -v -o sprockets-rails-3.4.2-tests.txz v3.4.2 test/
Source1: sprockets-rails-%{version}-tests.txz
-# Extracted from https://github.com/rails/sprockets-rails/commit/5fb466da6421daef086f1720e7961e348f5ce7c1
-Patch0: rubygem-%{gem_name}-3.3.0-rails7-actionview.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
@@ -39,7 +37,6 @@ Documentation for %{name}.
%setup -q -n %{gem_name}-%{version} -b 1
pushd %{_builddir}
-%patch0 -p1
popd
%build
@@ -70,6 +67,10 @@ popd
%doc %{gem_instdir}/README.md
%changelog
+* Wed Feb 01 2023 Pavel Valena <pvalena@redhat.com> - 3.4.2-1
+- Update to sprockets-rails 3.4.2.
+ Resolves: rhbz#2022436
+
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 81a5a37..9aeb732 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (sprockets-rails-3.2.2.gem) = 502f302048fb04c62bf247769f3339e236f7473ffdb80bbad7c635e934f182ceacca257f7fc6c3504a37eee66db889aff1b23701c55abb89d4e7046b21a60178
-SHA512 (sprockets-rails-3.2.2-tests.txz) = e7e38974d054339793d92288877bd7c5a8ae5b66bd894ed3d34eb9a314ab6f00e068fe3cb2bdecfc7205460d81148fc6ad9df0ef614a0f489ff9f7d51c72a932
+SHA512 (sprockets-rails-3.4.2.gem) = 87ab9269cb3d7c992bb5906dfea96b5a5a242ffaa8250e854a6116eb134b680e7855a5258a79b9414162037ea6dec1fd46643da930eabe56c27984524c27a205
+SHA512 (sprockets-rails-3.4.2-tests.txz) = f4357807815cd3a6537ac5bf09d922cc773ec8e48bad2a33627356ad8efeaf4eaacca1d68ec5ff064f0a8acab8e920779b5e2801cf3a90583d2ed0b5c7be516a
On branch rebase
Your branch and 'pvalena/rebase' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit (use -u to show untracked files)
To ssh://pkgs.fedoraproject.org/forks/pvalena/rpms/rubygem-sprockets-rails.git
! [rejected] rebase -> rebase (non-fast-forward)
error: failed to push some refs to 'ssh://pkgs.fedoraproject.org/forks/pvalena/rpms/rubygem-sprockets-rails.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
--> Could not push to: pvalena/rebase!
> Run copr build.
+ scripts/pkgs/cr-build.sh -c -t 30m rubygems
Created builds: 5388607
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment