Use relative path when no fixture_path configured (#1943)

Author: 11factory

lib/rspec/rails/fixture_file_upload_support.rb

@@ -7,8 +7,9 @@ module FixtureFileUploadSupport
     private
 
       def rails_fixture_file_wrapper
+        RailsFixtureFileWrapper.fixture_path = nil
         resolved_fixture_path = (fixture_path || RSpec.configuration.fixture_path || '')
-        RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '')
+        RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
         RailsFixtureFileWrapper.instance
       end
 
@@ -18,7 +19,7 @@ class RailsFixtureFileWrapper
         class << self
           attr_reader :fixture_path
 
-          # Get the instance of wrapper
+          # Get instance of wrapper
           def instance
             @instance ||= new
           end

spec/rspec/rails/fixture_file_upload_support_spec.rb

@@ -3,27 +3,33 @@
 module RSpec::Rails
   describe FixtureFileUploadSupport do
     context 'with fixture path set in config' do
-      before { RSpec.configuration.fixture_path = File.dirname(__FILE__) }
-
       it 'resolves fixture file' do
-        expect(fixture_file_upload_resolved.run).to be true
+        RSpec.configuration.fixture_path = File.dirname(__FILE__)
+        expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb').run).to be true
       end
     end
 
     context 'with fixture path set in spec' do
       it 'resolves fixture file' do
-        expect(fixture_file_upload_resolved(File.dirname(__FILE__)).run).to be true
+        expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb', File.dirname(__FILE__)).run).to be true
+      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
       end
     end
 
-    def fixture_file_upload_resolved(fixture_path = nil)
+    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 fixture_path
+        self.fixture_path = fixture_path
 
         it 'supports fixture file upload' do
-          file = fixture_file_upload(File.basename(__FILE__))
+          file = fixture_file_upload(fixture_name)
           expect(file.read).to match(/describe FixtureFileUploadSupport/im)
         end
       end