public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rubygem-actiontext] rawhide: Update to Action Text 8.1.2.
@ 2026-07-31 11:03 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-07-31 11:03 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/rubygem-actiontext
            Branch : rawhide
            Commit : bc033a1c5ccb888cc2a8b0678f7d1be27453c256
            Author : Vít Ondruch <vondruch@redhat.com>
            Date   : 2026-07-31T12:49:28+02:00
            Stats  : +60/-24 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/rubygem-actiontext/c/bc033a1c5ccb888cc2a8b0678f7d1be27453c256?branch=rawhide

            Log:
            Update to Action Text 8.1.2.

Related: rhzb#2405582

---
diff --git a/rubygem-actiontext-8.1.3-Avoid-assert-nil-when-testing-objects-that-override-nil-.patch b/rubygem-actiontext-8.1.3-Avoid-assert-nil-when-testing-objects-that-override-nil-.patch
new file mode 100644
index 0000000..3d8403c
--- /dev/null
+++ b/rubygem-actiontext-8.1.3-Avoid-assert-nil-when-testing-objects-that-override-nil-.patch
@@ -0,0 +1,32 @@
+From ed56fd73fa0c7d19d5d028db50b731586aad0fdb Mon Sep 17 00:00:00 2001
+From: mugitti9 <mugikurash@gmail.com>
+Date: Fri, 1 May 2026 19:41:45 +0900
+Subject: [PATCH] Avoid assert_nil when testing objects that override nil?
+
+minitest changed assert_nil to use `nil ==` instead of `nil?` in 6.0.6.
+---
+ actiontext/test/unit/model_test.rb       | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/actiontext/test/unit/model_test.rb b/actiontext/test/unit/model_test.rb
+index e57d6567efb56..0799d7184d3db 100644
+--- a/actiontext/test/unit/model_test.rb
++++ b/actiontext/test/unit/model_test.rb
+@@ -18,7 +18,7 @@ class ActionText::ModelTest < ActiveSupport::TestCase
+   test "without content" do
+     assert_difference("ActionText::RichText.count" => 0) do
+       message = Message.create!(subject: "Greetings")
+-      assert_nil message.content
++      assert_equal true, message.content.nil?
+       assert_predicate message.content, :blank?
+       assert_predicate message.content, :empty?
+       assert_not message.content?
+@@ -146,7 +146,7 @@ class ActionText::ModelTest < ActiveSupport::TestCase
+   test "with blank content and store_if_blank: false" do
+     assert_difference("ActionText::RichText.count" => 0) do
+       message = MessageWithoutBlanks.create!(subject: "Greetings", content: "")
+-      assert_nil message.content
++      assert_equal true, message.content.nil?
+       assert_predicate message.content, :blank?
+       assert_predicate message.content, :empty?
+       assert_not message.content?

diff --git a/rubygem-actiontext.spec b/rubygem-actiontext.spec
index 64be241..f7705f0 100644
--- a/rubygem-actiontext.spec
+++ b/rubygem-actiontext.spec
@@ -7,23 +7,32 @@
 %bcond_with js_recompilation
 
 Name: rubygem-%{gem_name}
-Version: 8.0.3
-Release: 3%{?dist}
+Version: 8.1.2
+Release: 1%{?dist}
 Summary: Rich text framework
 License: MIT
 URL: https://rubyonrails.org
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem
 # git clone https://github.com/rails/rails.git --no-checkout && cd rails/actiontext
-# git archive -v -o actiontext-8.0.3-tests.tar.gz v8.0.3 test/
+# git archive -v -o actiontext-8.1.2-tests.tar.gz v8.1.2 test/
 Source1: %{gem_name}-%{version}%{?prerelease}-tests.tar.gz
 # Source code of pregenerated JS files.
 # git clone https://github.com/rails/rails.git && cd rails/actiontext
-# git archive -v -o actiontext-8.0.3-js.tar.gz v8.0.3 app/javascript rollup.config.js
+# git archive -v -o actiontext-8.1.2-js.tar.gz v8.1.2 rollup.config.js
 Source2: %{gem_name}-%{version}%{?prerelease}-js.tar.gz
+# Fix compatiblity with 6.0.6+ preventig error such as:
+# ~~~
+# Failure:
+# ActionText::ModelTest#test_without_content [test/unit/model_test.rb:19]:
+# Expected #<ActionText::RichText id: nil, name: "content", body: nil, record_type: "Message", record_id: 926854805, created_at: nil, updated_at: nil> to be nil.
+# ~~~
+# https://github.com/rails/rails/pull/57283
+Patch0: rubygem-actiontext-8.1.3-Avoid-assert-nil-when-testing-objects-that-override-nil-.patch
 
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby >= 3.2.0
+BuildRequires: rubygem(action_text-trix)
 BuildRequires: rubygem(actionmailer) = %{version}
 BuildRequires: rubygem(activestorage) = %{version}
 BuildRequires: rubygem(bundler)
@@ -35,23 +44,13 @@ BuildRequires: rubygem(sqlite3)
 BuildRequires: rubygem(capybara) >= 3.26
 BuildRequires: rubygem(puma)
 BuildRequires: rubygem(selenium-webdriver)
-BuildRequires: chromedriver chromium chromium-headless
+BuildRequires: chromedriver chromium
 # Chromium availability is limited:
 # https://src.fedoraproject.org/rpms/chromium/blob/0d9761748509bb12051ab149d28c1052cd834f87/f/chromium.spec#_800
-# and chrome-headless even more:
-# https://src.fedoraproject.org/rpms/chromium/blob/0d9761748509bb12051ab149d28c1052cd834f87/f/chromium.spec#_46-48
 ExclusiveArch: x86_64 aarch64 noarch
 %{?with_js_recompilation:BuildRequires: %{_bindir}/npm}
 BuildArch: noarch
 
-# Bundles Trix editor.
-# https://trix-editor.org/
-# https://github.com/basecamp/trix
-# app/assets/javascripts/trix.js
-# TODO: would be nice to check the version. Althoug the bundled Trix is going
-# to be extracted into independent gem: https://github.com/rails/rails/pull/55058
-Provides: bundled(js-trix) = 2.1.12
-
 %description
 Edit and display rich text in Rails applications.
 
@@ -65,7 +64,11 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2
+%setup -q -n %{gem_name}-%{version}%{?prerelease} -b 1 -b 2
+
+( cd %{builddir}
+%patch 0 -p2
+)
 
 %build
 %if %{with js_recompilation}
@@ -78,15 +81,11 @@ find app/assets/ -type f -exec sha512sum {} \;
 
 rm -rf app/assets/javacripts/actiontext.*
 
-ln -s %{builddir}/app/javascript ./app/javascript
 cp -a %{builddir}/rollup.config.js .
 
 # TODO: This requires network access. Use Fedora rollup.js if it becomes
 # available eventually
-# `rollup-plugin-terser` is missing from package.json, otherwise `npm install`
-# would be enough.
-# https://github.com/rails/rails/issues/54795
-npm install rollup-plugin-terser
+npm install
 npx rollup --config rollup.config.js
 
 # For comparison with the orginal checksum above.
@@ -117,6 +116,7 @@ export BUNDLE_GEMFILE=${PWD}/../Gemfile
 # The `Gemfiles` is unavoidable, otherwise `importmap-rails` are not properly
 # loaded.
 cat > $BUNDLE_GEMFILE <<EOF
+gem "action_text-trix"
 gem "actionmailer"
 gem "activestorage"
 gem "capybara"
@@ -153,6 +153,10 @@ ruby -Itest -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Fri Jul 31 2026 Vít Ondruch <vondruch@redhat.com> - 8.1.2-1
+- Update to Action Text 8.1.2.
+  Related: rhzb#2405582
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index 2420f5b..1a2bd75 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (actiontext-8.0.3-js.tar.gz) = 1a8aa25bfd960827a9949c27f11bfc51a9185ed415df344a87924dbac06bf9e9041d6edc7cdb50a22f06257e82d9dd6d32e66efe86ec644994a82e4e05eccf63
-SHA512 (actiontext-8.0.3-tests.tar.gz) = 282be90d9535468d236df7d0385eaeb79c71e75b976d294dd90a5c1318259693b1a8ed0d59302f44684c3fb92d07e3b636f89c8a8da2008f85036e2d9e4b0396
-SHA512 (actiontext-8.0.3.gem) = 4ba557936425c1e522dd68e030589f058929904973c20435cfb444b67a16dc2de3c89299bc13804fcc6773c4812c1650ba47816e85ec7a4c3fbb777f842497e8
+SHA512 (actiontext-8.1.2-js.tar.gz) = a1adbb2ab3089b67a584b5505622f13ecbfc9681033728b3c783edcdbad66ef9460fb2dfb686fce9b91db23e6905062783c28fe151c874731ce6245e0e4045be
+SHA512 (actiontext-8.1.2-tests.tar.gz) = 240176d5f64e53aa49502adca92d7e5b102aed0a9f4cf275c48846ab842d3f8dcb96704415002e83b1171b80c0dd71a3bf74664b65f5d3419f37b41c12239889
+SHA512 (actiontext-8.1.2.gem) = d36a17d51abd898ca5083966d2604dee77693b20a080f44c36f87f75c141393390593c785f13afdacf0c032c8679598d3577fa657dd97b97c6c7142f13d32f15

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-31 11:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-31 11:03 [rpms/rubygem-actiontext] rawhide: Update to Action Text 8.1.2 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox