diff --git a/actiontext-6.1.4.1.gem b/actiontext-6.1.4.1.gem deleted file mode 100644 index 2e16b30..0000000 Binary files a/actiontext-6.1.4.1.gem and /dev/null differ diff --git a/actiontext-6.1.4.1-tests.txz b/actiontext-7.0.4-tests.txz similarity index 97% rename from actiontext-6.1.4.1-tests.txz rename to actiontext-7.0.4-tests.txz index 3070314..a0743d7 100644 Binary files a/actiontext-6.1.4.1-tests.txz and b/actiontext-7.0.4-tests.txz differ diff --git a/actiontext-7.0.4.gem b/actiontext-7.0.4.gem new file mode 100644 index 0000000..79ad0ad Binary files /dev/null and b/actiontext-7.0.4.gem differ diff --git a/rails-6.1.4.1-tools.txz b/rails-7.0.4-tools.txz similarity index 95% rename from rails-6.1.4.1-tools.txz rename to rails-7.0.4-tools.txz index 2a29578..a34575f 100644 Binary files a/rails-6.1.4.1-tools.txz and b/rails-7.0.4-tools.txz differ diff --git a/rubygem-actiontext.spec b/rubygem-actiontext.spec index 932af12..efd54a5 100644 --- a/rubygem-actiontext.spec +++ b/rubygem-actiontext.spec @@ -4,7 +4,7 @@ %bcond_with webdrivers Name: rubygem-%{gem_name} -Version: 6.1.4.1 +Version: 7.0.4 Release: 1 Summary: Rich text framework License: MIT @@ -12,12 +12,12 @@ URL: https://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # Tests are not shipped with the gem # git clone https://github.com/rails/rails.git --no-checkout -# cd rails/actiontext && git archive -v -o actiontext-6.1.4.1-tests.txz v6.1.4.1 test/ +# cd rails/actiontext && git archive -v -o actiontext-7.0.4-tests.txz v7.0.4 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.4.1-tools.txz v6.1.4.1 tools/ +# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz BuildRequires: ruby(release) @@ -74,6 +74,10 @@ echo > test/dummy/config/initializers/assets.rb mv test/system/system_test_helper_test.rb{,.disable} %endif +# Disable misbehaving test ActionText::ModelTest#test_eager_loading_all_rich_text +# https://github.com/rails/rails/pull/46042 +sed -i -e '/test "eager loading all rich text" do/ a \ + skip' test/unit/model_test.rb ruby -rselenium-webdriver -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' popd @@ -93,5 +97,8 @@ popd %doc %{gem_instdir}/README.md %changelog +* Thu Jan 19 2023 wangkai - 7.0.4-1 +- Upgrade to version 7.0.4 + * Wed Mar 2 2022 caodongxia - 6.1.4.1-1 - Init package