Browse Source

Move streaming `around` config into manager class (#28684)

Matt Jankowski 4 months ago
parent
commit
4e08a4892f
2 changed files with 13 additions and 15 deletions
  1. 0 15
      spec/rails_helper.rb
  2. 13 0
      spec/support/streaming_server_manager.rb

+ 0 - 15
spec/rails_helper.rb

@@ -107,21 +107,6 @@ RSpec.configure do |config|
     Capybara.current_driver = :rack_test
   end
 
-  config.around :each, type: :system do |example|
-    # The streaming server needs access to the database
-    # but with use_transactional_tests every transaction
-    # is rolled-back, so the streaming server never sees the data
-    # So we disable this feature for system tests, and use DatabaseCleaner to clean
-    # the database tables between each test
-    self.use_transactional_tests = false
-
-    DatabaseCleaner.cleaning do
-      example.run
-    end
-
-    self.use_transactional_tests = true
-  end
-
   config.before do |example|
     allow(Resolv::DNS).to receive(:open).and_raise('Real DNS queries are disabled, stub Resolv::DNS as needed') unless example.metadata[:type] == :system
   end

+ 13 - 0
spec/support/streaming_server_manager.rb

@@ -95,6 +95,19 @@ RSpec.configure do |config|
     end
   end
 
+  config.around :each, type: :system do |example|
+    # Streaming server needs DB access but `use_transactional_tests` rolls back
+    # every transaction. Disable this feature for streaming tests, and use
+    # DatabaseCleaner to clean the database tables between each test.
+    self.use_transactional_tests = false
+
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+
+    self.use_transactional_tests = true
+  end
+
   private
 
   def streaming_server_manager