solidus_dev_support 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b89b3a9856d2e920d23a4aa6b111f5d0183ac78c6a4148b1eb41627277bc5a
-  data.tar.gz: b5ba6eda194e217eb30e965a278f69cf3a0ecd09d3c1b589e66cfbe4bdb49ad5
+  metadata.gz: 2909d8c487345aa45ebf8962ace27cbc7d8e2a34eeb2f3eb6ba380913b50c2b4
+  data.tar.gz: a921fad3ec04944509f46f7a113a073b48100971395950525242c48a83b994e4
 SHA512:
-  metadata.gz: 778ebb59f1f980c9a978fb353c3ba68b4e89bdafe1b0f2d4509108fcac286f08e9e7c1923db706ff809f4bea47df6359dfa82c012b8061dcfabc9f0afd5701c1
-  data.tar.gz: f1de5819cdd6f252490fa1ee458765b1a47dd1a82f46e92b5b7b027fe80682b6955144aaa7491f4bf56cae910133431a2fa7dc842365d9b69170b251d2a8fe3c
+  metadata.gz: bbb86bd58f06496f53b3c5f4d84ce47b41b9be72135d77aba58ee12b0bffdbc3afef0325fc4ec1dd2926d6cf6a97b11527380372ba28e4adb26719f5d3c9dc4d
+  data.tar.gz: 39e02e67c9b94436456bf5c751196a6b600dac9ac70b7c90488fa5f2793f959c41302cfc8b66ad860c1daac28ea8811e41571fd711f18ba55526ea59133b3fae

data/lib/solidus_dev_support/testing_support/factories.rb

@@ -1,10 +1,28 @@
 # frozen_string_literal: true
 
+require 'factory_bot'
+
+Spree::Deprecation.silence do
+  require 'spree/testing_support/factories'
+  puts <<~MSG
+    We are transitioning to a new way of loading factories for extensions.
+    Be sure this extension does not load factories using require but uses
+    the load_for() method in its spec_helper.rb, eg:
+
+      SolidusDevSupport::TestingSupport::Factories.load_for(ExtensionName1::Engine, ExtensionName2::Engine)
+
+    This will load Solidus Core factories right before the ones defined in
+    lib/extension_name/testing_support/factories/*_factory.rb or
+    lib/extension_name/testing_support/factories.rb
+
+    This message will be removed when all extensions are updated.
+  MSG
+end
+
 begin
   require 'spree/testing_support/factory_bot'
 rescue LoadError
-  require 'factory_bot'
-  require 'spree/testing_support/factories'
+  # Do nothing, we are testing the extension against an old version of Solidus
 end
 
 module SolidusDevSupport
@@ -12,21 +30,37 @@ module SolidusDevSupport
     module Factories
       def self.load_for(*engines)
         paths = engines.flat_map do |engine|
-          factories_file_or_folder = engine.root.glob('lib/*/testing_support/factories{,.rb}')
-
-          if factories_file_or_folder.size == 2 && using_factory_bot_definition_file_paths?
-            folder, file = factories_file_or_folder.partition(&:directory?).map(&:first).map { |path| path.to_s.gsub(engine.root.to_s, '') }
+          # Check if the extension has a lib/*/factories.rb. If it does, we emit a
+          # deprecation warning and just use it.
+          obsolete_factories_file = engine.root.glob('lib/*/factories.rb').first # 'lib/*/factories/*_factory.rb'
+          if obsolete_factories_file.present?
             ActiveSupport::Deprecation.warn <<-WARN.squish, caller(4)
               SolidusDevSupport::TestingSupport::Factories.load_for() is automatically loading
-              all factories present into #{folder}. You should now safely remove #{file} if it
-              is only used to load ./factories content.
+              all factories present in #{obsolete_factories_file.dirname.to_s.gsub(engine.root.to_s, '')}/testing_support/factories/.
+              Please move the content of #{obsolete_factories_file.to_s.gsub(engine.root.to_s, '')} to that directory.
             WARN
 
-            engine.root.glob('lib/*/testing_support/factories/**/*_factory.rb')
+            [obsolete_factories_file]
           else
-            factories_file_or_folder
-          end.map { |path| path.sub(/.rb\z/, '').to_s }
-        end
+            # If there are both a lib/*/testing_support/factories.rb and a lib/*/testing_support/factories/,
+            # we assume that the factories.rb file is only used to load all factories prensent in the directory.
+            # That file can be removed from the extension, in fact, we ignore it and emit a message asking to
+            # remove it.
+            factories_file_or_folder = engine.root.glob('lib/*/testing_support/factories{,.rb}')
+            if factories_file_or_folder.size == 2
+              folder, file = factories_file_or_folder.partition(&:directory?).map(&:first).map { |path| path.to_s.gsub(engine.root.to_s, '') }
+              ActiveSupport::Deprecation.warn <<-WARN.squish, caller(4)
+                SolidusDevSupport::TestingSupport::Factories.load_for() is automatically loading
+                all factories present into #{folder}. You should now safely remove #{file} if it
+                is only used to load ./factories content.
+              WARN
+
+              engine.root.glob('lib/*/testing_support/factories/**/*_factory.rb')
+            else
+              factories_file_or_folder
+            end
+          end
+        end.map { |path| path.sub(/.rb\z/, '').to_s }
 
         if using_factory_bot_definition_file_paths?
           FactoryBot.definition_file_paths = [

data/lib/solidus_dev_support/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusDevSupport
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 
   def self.gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Alessandro Desantis