Merge pull request #2215 from Edouard-chin/ec-rails-master

Fix `WrongScopeError` being thrown on Rails master:

Author: JonRowe

lib/rspec/rails/fixture_support.rb

@@ -39,6 +39,12 @@ def self.proxy_method_warning_if_called_in_before_context_scope(method_name)
             end
           end
 
+          if ::Rails.version.to_f >= 6.1
+            def name
+              @example
+            end
+          end
+
           fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
         end
       end

spec/rspec/rails/configuration_spec.rb

@@ -196,7 +196,9 @@ def in_inferring_type_from_location_environment
 
   it "metadata `type: :request` sets up request example groups" do
     a_rails_app = double("Rails application")
-    the_rails_module = Module.new
+    the_rails_module = Module.new {
+      def self.version; end;
+    }
     allow(the_rails_module).to receive(:application) { a_rails_app }
     version = ::Rails::VERSION
     stub_const "Rails", the_rails_module
@@ -230,7 +232,9 @@ def in_inferring_type_from_location_environment
 
   it "metadata `type: :feature` sets up feature example groups" do
     a_rails_app = double("Rails application")
-    the_rails_module = Module.new
+    the_rails_module = Module.new {
+      def self.version; end;
+    }
     allow(the_rails_module).to receive(:application) { a_rails_app }
     version = ::Rails::VERSION
     stub_const "Rails", the_rails_module

spec/rspec/rails/fixture_support_spec.rb

@@ -13,5 +13,16 @@ module RSpec::Rails
         expect(group).to respond_to(:fixture_path=)
       end
     end
+
+    it "will allow #setup_fixture to run successfully", if: Rails.version.to_f > 6.0 do
+
+      group = RSpec::Core::ExampleGroup.describe do
+        include FixtureSupport
+
+        self.use_transactional_tests = false
+      end
+
+      expect { group.new.setup_fixtures }.to_not raise_error
+    end
   end
 end