public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rubygem-factory_bot] f45: Update to 6.6.0
@ 2026-09-04 13:23 LuK1337
  0 siblings, 0 replies; only message in thread
From: LuK1337 @ 2026-09-04 13:23 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rubygem-factory_bot
Branch : f45
Commit : 10d36d33584cee6e280aa3832db7b2d2604916b6
Author : LuK1337 <priv.luk@gmail.com>
Date   : 2026-09-04T15:15:09+02:00
Stats  : +7/-163 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/rubygem-factory_bot/c/10d36d33584cee6e280aa3832db7b2d2604916b6?branch=f45

Log:
Update to 6.6.0

---
diff --git a/rubygem-factory_bot-pr1561-ruby32-ruby32-did_you_mean-test.patch b/rubygem-factory_bot-pr1561-ruby32-ruby32-did_you_mean-test.patch
deleted file mode 100644
index 8056e18..0000000
--- a/rubygem-factory_bot-pr1561-ruby32-ruby32-did_you_mean-test.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From f571e1906d805f021f68a721d2161fea7add2a3d Mon Sep 17 00:00:00 2001
-From: Daniel Colson <danieljamescolson@gmail.com>
-Date: Sun, 25 Dec 2022 21:03:29 -0500
-Subject: [PATCH] Pass key and receiver to custom key errors
-
-did_you_mean tests started failing on Ruby 3.2 because of
-https://bugs.ruby-lang.org/issues/18564.
-
-This gets did_you_mean working again for Ruby 3.2 by adding the original
-KeyError's key and receiver over to the custom KeyError. That way the
-did_you_mean can get added to the custom KeyError via the new
-detailed_message.
----
- lib/factory_bot/definition.rb                 | 29 +++++++++++++------
- lib/factory_bot/registry.rb                   | 18 ++++++++++--
- spec/acceptance/traits_spec.rb                |  8 +----
- spec/factory_bot/registry_spec.rb             |  3 +-
- .../matchers/raise_did_you_mean_error.rb      | 18 ++++++++++++
- 5 files changed, 55 insertions(+), 21 deletions(-)
- create mode 100644 spec/support/matchers/raise_did_you_mean_error.rb
-
-diff --git a/lib/factory_bot/definition.rb b/lib/factory_bot/definition.rb
-index ab6b34156..1294ac569 100644
---- a/lib/factory_bot/definition.rb
-+++ b/lib/factory_bot/definition.rb
-@@ -115,15 +115,26 @@ def base_traits
-       raise error_with_definition_name(error)
-     end
- 
--    def error_with_definition_name(error)
--      message = error.message
--      message.insert(
--        message.index("\nDid you mean?") || message.length,
--        " referenced within \"#{name}\" definition"
--      )
--
--      error.class.new(message).tap do |new_error|
--        new_error.set_backtrace(error.backtrace)
-+    # detailed_message introduced in Ruby 3.2 for cleaner integration with
-+    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
-+    if KeyError.method_defined?(:detailed_message)
-+      def error_with_definition_name(error)
-+        message = error.message + " referenced within \"#{name}\" definition"
-+
-+        error.class.new(message, key: error.key, receiver: error.receiver)
-+          .tap { |new_error| new_error.set_backtrace(error.backtrace) }
-+      end
-+    else
-+      def error_with_definition_name(error)
-+        message = error.message
-+        message.insert(
-+          message.index("\nDid you mean?") || message.length,
-+          " referenced within \"#{name}\" definition"
-+        )
-+
-+        error.class.new(message).tap do |new_error|
-+          new_error.set_backtrace(error.backtrace)
-+        end
-       end
-     end
- 
-diff --git a/lib/factory_bot/registry.rb b/lib/factory_bot/registry.rb
-index c7eb03981..e58c4d5b8 100644
---- a/lib/factory_bot/registry.rb
-+++ b/lib/factory_bot/registry.rb
-@@ -39,9 +39,21 @@ def registered?(name)
- 
-     def key_error_with_custom_message(key_error)
-       message = key_error.message.sub("key not found", "#{@name} not registered")
--      error = KeyError.new(message)
--      error.set_backtrace(key_error.backtrace)
--      error
-+      new_key_error(message, key_error).tap do |error|
-+        error.set_backtrace(key_error.backtrace)
-+      end
-+    end
-+
-+    # detailed_message introduced in Ruby 3.2 for cleaner integration with
-+    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
-+    if KeyError.method_defined?(:detailed_message)
-+      def new_key_error(message, key_error)
-+        KeyError.new(message, key: key_error.key, receiver: key_error.receiver)
-+      end
-+    else
-+      def new_key_error(message, _)
-+        KeyError.new(message)
-+      end
-     end
-   end
- end
-diff --git a/spec/acceptance/traits_spec.rb b/spec/acceptance/traits_spec.rb
-index 293f9635a..24289cf7f 100644
---- a/spec/acceptance/traits_spec.rb
-+++ b/spec/acceptance/traits_spec.rb
-@@ -324,13 +324,7 @@ def build_user_factory_with_admin_trait(trait_name)
-         end
-       end
- 
--      expect { FactoryBot.build(:user) }.to raise_error(
--        KeyError,
--        <<~MSG.strip
--          Trait not registered: "not_quite" referenced within "user" definition
--          Did you mean?  "not_quit"
--        MSG
--      )
-+      expect { FactoryBot.build(:user) }.to raise_did_you_mean_error
-     end
-   end
- 
-diff --git a/spec/factory_bot/registry_spec.rb b/spec/factory_bot/registry_spec.rb
-index e793ec670..4749658a8 100644
---- a/spec/factory_bot/registry_spec.rb
-+++ b/spec/factory_bot/registry_spec.rb
-@@ -33,8 +33,7 @@
-     registered_object = double(:registered_object)
-     registry.register(:factory_bot, registered_object)
- 
--    expect { registry.find(:factory_bit) }
--      .to raise_error(KeyError, /Did you mean\?  "factory_bot"/)
-+    expect { registry.find(:factory_bit) }.to raise_did_you_mean_error
-   end
- 
-   it "adds and returns the object registered" do
-diff --git a/spec/support/matchers/raise_did_you_mean_error.rb b/spec/support/matchers/raise_did_you_mean_error.rb
-new file mode 100644
-index 000000000..dd5579ffe
---- /dev/null
-+++ b/spec/support/matchers/raise_did_you_mean_error.rb
-@@ -0,0 +1,18 @@
-+RSpec::Matchers.define :raise_did_you_mean_error do
-+  supports_block_expectations
-+
-+  match do |actual|
-+    # detailed_message introduced in Ruby 3.2 for cleaner integration with
-+    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
-+    matcher = if KeyError.method_defined?(:detailed_message)
-+      raise_error(
-+        an_instance_of(KeyError)
-+        .and(having_attributes(detailed_message: /Did you mean\?/))
-+      )
-+    else
-+      raise_error(KeyError, /Did you mean\?/)
-+    end
-+
-+    expect(actual).to matcher
-+  end
-+end

diff --git a/rubygem-factory_bot.spec b/rubygem-factory_bot.spec
index 13fae9a..b8613d8 100644
--- a/rubygem-factory_bot.spec
+++ b/rubygem-factory_bot.spec
@@ -1,21 +1,18 @@
 %global gem_name factory_bot
 
 Name: rubygem-%{gem_name}
-Version: 6.2.1
+Version: 6.6.0
 Release: %autorelease
 Summary: Framework and DSL for defining and using model instance factories
 License: MIT
 URL: https://github.com/thoughtbot/factory_bot
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone --no-checkout https://github.com/thoughtbot/factory_bot.git
-# git -C factory_bot archive -v -o factory_bot-6.2.1-specs.txz v6.2.1 spec/
+# git -C factory_bot archive -v -o factory_bot-6.6.0-specs.txz v6.6.0 spec/
 Source1: %{gem_name}-%{version}-specs.txz
 # git clone --no-checkout https://github.com/thoughtbot/factory_bot.git
-# git -C factory_bot archive -v -o factory_bot-6.2.1-features.txz v6.2.1 features/
+# git -C factory_bot archive -v -o factory_bot-6.6.0-features.txz v6.6.0 features/
 Source2: %{gem_name}-%{version}-features.txz
-# https://github.com/thoughtbot/factory_bot/pull/1561
-# ruby3.2 changes did_you_mean behavior
-Patch0:  %{name}-pr1561-ruby32-ruby32-did_you_mean-test.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
@@ -46,12 +43,6 @@ Documentation for %{name}.
 %prep
 # Unpack Source1 and Source2
 %setup -q -n %{gem_name}-%{version} -b 1 -b 2
-(
-cd %{_builddir}
-mv %{gem_name}-%{version}/lib .
-%patch -P0 -p1
-mv lib %{gem_name}-%{version}
-)
 
 %build
 gem build ../%{gem_name}-%{version}.gemspec
@@ -70,7 +61,7 @@ cp -a %{_builddir}/spec .
 # We don't care about coverage.
 sed -i "/simplecov/ s/^/#/" spec/spec_helper.rb
 
-rspec -rfileutils -rspec_helper spec
+rspec -rspec_helper spec
 
 ln -s %{_builddir}/features .
 sed -i "/simplecov/ s/^/#/" features/support/env.rb

diff --git a/sources b/sources
index 6b46933..121be32 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (factory_bot-6.2.1.gem) = 6a3eadbfe77a1261621614bfb2a66d4800f2b4b3307623ed58f74aaf26070e54c411d27f0bf4ccc6059590fb1815143cafb131e4f6a84b59c80ed0685755c24a
-SHA512 (factory_bot-6.2.1-specs.txz) = 3a64f130462d90f7ffdb7395a3615cd4a76de05bab93d162b3bcfaf85cae353c6ac3f75cd145875c25ee8caf8be5dc8e05f779097cd539db451c77f4895476c3
-SHA512 (factory_bot-6.2.1-features.txz) = d2f12ad31bd9d50b1c9ef9df37444b2a44051f9e12ba28d2b8504f34d377121dc8410f5e03b742398878078eba2bdca2d1b2c1afcd1c63b3e53e314992952cb8
+SHA512 (factory_bot-6.6.0.gem) = bdc3b9873db023eaee97885d661c6981965725cec4c85f7964b2e4a86e7a97f919e42387f1e91fb04b614cd128b4ca19f4c8744ec00757c92a155fec4241daee
+SHA512 (factory_bot-6.6.0-specs.txz) = e1a4a10a08eb180e7004e2f02a5a4bea9be3bd45b26120e61b1f7251e99146d4132071e0c402d3a9049616a62d378280916acca49935de5f3f33bf861fe637b1
+SHA512 (factory_bot-6.6.0-features.txz) = 91fbcd12515ca9ca7ecee1ed3775b6b387d17dbdc684c524d5ed01fcbb76b02ebae05d70b4b402035a513ea9d5a3ce5c622b33e7c8ca742384dcc6de37dac22e

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

only message in thread, other threads:[~2026-09-04 13:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-04 13:23 [rpms/rubygem-factory_bot] f45: Update to 6.6.0 LuK1337

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