Switch accessor for fixture path in file upload support for 6.1

Author: JonRowe

Changelog.md

@@ -1,3 +1,8 @@
+### Rails 6.1 Development
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/main...rails-6-1-dev)
+
+* Support new #file_fixture_path and new fixture test support code. (Jon Rowe, #2398)
+
 ### Development
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.1...main)
 

lib/rspec/rails/fixture_file_upload_support.rb

@@ -6,21 +6,42 @@ module FixtureFileUploadSupport
 
     private
 
-      def rails_fixture_file_wrapper
-        RailsFixtureFileWrapper.fixture_path = nil
-        resolved_fixture_path =
-          if respond_to?(:fixture_path) && !fixture_path.nil?
-            fixture_path.to_s
-          else
-            (RSpec.configuration.fixture_path || '').to_s
-          end
-        RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
-        RailsFixtureFileWrapper.instance
+      # In Rails 6.2 fixture file path needs to be relative to `file_fixture_path` instead, this change
+      # was brought in with a deprecation warning on 6.1. In Rails 6.2 expect to rework this to remove
+      # the old accessor.
+      if ::Rails.version.to_f >= 6.1
+        def rails_fixture_file_wrapper
+          RailsFixtureFileWrapper.file_fixture_path = nil
+          resolved_fixture_path =
+            if respond_to?(:file_fixture_path) && !file_fixture_path.nil?
+              file_fixture_path.to_s
+            else
+              (RSpec.configuration.fixture_path || '').to_s
+            end
+          RailsFixtureFileWrapper.file_fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
+          RailsFixtureFileWrapper.instance
+        end
+      else
+        def rails_fixture_file_wrapper
+          RailsFixtureFileWrapper.fixture_path = nil
+          resolved_fixture_path =
+            if respond_to?(:fixture_path) && !fixture_path.nil?
+              fixture_path.to_s
+            else
+              (RSpec.configuration.fixture_path || '').to_s
+            end
+          RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
+          RailsFixtureFileWrapper.instance
+        end
       end
 
       class RailsFixtureFileWrapper
         include ActionDispatch::TestProcess if defined?(ActionDispatch::TestProcess)
 
+        if ::Rails.version.to_f >= 6.1
+          include ActiveSupport::Testing::FileFixtures
+        end
+
         class << self
           attr_accessor :fixture_path
 

spec/rspec/rails/fixture_file_upload_support_spec.rb

@@ -3,33 +3,43 @@ module RSpec::Rails
     context 'with fixture path set in config' do
       it 'resolves fixture file' do
         RSpec.configuration.fixture_path = File.dirname(__FILE__)
-        expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb').run).to be true
+        expect_to_pass fixture_file_upload_resolved('fixture_file_upload_support_spec.rb')
       end
 
       it 'resolves supports `Pathname` objects' do
         RSpec.configuration.fixture_path = Pathname(File.dirname(__FILE__))
-        expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb').run).to be true
+        expect_to_pass fixture_file_upload_resolved('fixture_file_upload_support_spec.rb')
       end
     end
 
     context 'with fixture path set in spec' do
       it 'resolves fixture file' do
-        expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb', File.dirname(__FILE__)).run).to be true
+        expect_to_pass fixture_file_upload_resolved('fixture_file_upload_support_spec.rb', File.dirname(__FILE__))
       end
     end
 
     context 'with fixture path not set' do
       it 'resolves fixture using relative path' do
         RSpec.configuration.fixture_path = nil
-        expect(fixture_file_upload_resolved('spec/rspec/rails/fixture_file_upload_support_spec.rb').run).to be true
+        expect_to_pass fixture_file_upload_resolved('spec/rspec/rails/fixture_file_upload_support_spec.rb')
       end
     end
 
+    def expect_to_pass(group)
+      result = group.run(failure_reporter)
+      failure_reporter.exceptions.map { |e| raise e }
+      expect(result).to be true
+    end
+
     def fixture_file_upload_resolved(fixture_name, fixture_path = nil)
       RSpec::Core::ExampleGroup.describe do
         include RSpec::Rails::FixtureFileUploadSupport
 
-        self.fixture_path = fixture_path
+        if ::Rails.version.to_f >= 6.1
+          self.file_fixture_path = fixture_path
+        else
+          self.fixture_path = fixture_path
+        end
 
         it 'supports fixture file upload' do
           file = fixture_file_upload(fixture_name)