(maint) avoid clashing test with actual fixture, pt2

This might have been uncovered by the autoloader reset and random order
testing. To make sure it does not recur, this change moves the autoloader
reset to the top and runs it after each example.

Author: DavidS

spec/integration/resource_api/transport_spec.rb

@@ -1,13 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe 'Resource API Transport integration tests:' do
-  after(:each) do
-    # reset registered transports between tests to reduce cross-test poisoning
-    Puppet::ResourceApi::Transport.instance_variable_set(:@transports, nil)
-    autoloader = Puppet::ResourceApi::Transport.instance_variable_get(:@autoloader)
-    autoloader.class.loaded.clear
-  end
-
   describe '#list_all_transports' do
     subject(:transports) { Puppet::ResourceApi::Transport.list_all_transports('rp_env') }
 

spec/puppet/resource_api/transport_spec.rb

@@ -29,11 +29,6 @@ def change_environment(name = nil)
     Puppet.debug = true
   end
 
-  after(:each) do
-    # reset registered transports between tests to reduce cross-test poisoning
-    described_class.instance_variable_set(:@transports, nil)
-  end
-
   describe '#register(schema)' do
     context 'when registering a schema with missing keys' do
       it { expect { described_class.register([]) }.to raise_error(Puppet::DevError, %r{requires a hash as schema}) }

spec/puppet/resource_api_spec.rb

@@ -1824,7 +1824,7 @@ def set(_context, changes) end
   context 'when loading a type with unknown features' do
     let(:definition) do
       {
-        name: 'test_noop_support',
+        name: 'test_noop_support_2',
         desc: 'a test resource',
         features: ['no such feature'],
         attributes: {},

spec/spec_helper.rb

@@ -30,3 +30,14 @@
 
 # exclude the `version.rb` which already gets loaded by bundler via the gemspec, and doesn't need coverage testing anyways.
 SimpleCov.add_filter 'lib/puppet/resource_api/version.rb' if ENV['SIMPLECOV'] == 'yes'
+
+# configure this hook after Resource API is loaded to get access to Puppet::ResourceApi::Transport
+RSpec.configure do |config|
+  config.after(:each) do
+    # reset registered transports between tests to reduce cross-test poisoning
+    Puppet::ResourceApi::Transport.instance_variable_set(:@transports, nil)
+    if (autoloader = Puppet::ResourceApi::Transport.instance_variable_get(:@autoloader))
+      autoloader.class.loaded.clear
+    end
+  end
+end