rspec-multicore-rails 0.2.0.pre2 → 0.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab0db5c29ef823bd0106eae9fe429e50ff913d399735be5eaa3b1ed0ae766f0
-  data.tar.gz: a889a51713b6715cdd19f0793025b0c1a74997f20666458760d8a0e33e275d45
+  metadata.gz: 3c3050617c4ec5b96ff57ac77a08a685e24c0a056d9c029464ec4f950d894369
+  data.tar.gz: f87be93f0ba0d16fd7b55200bd8a955ff9f334d06a327c2970701204998694ba
 SHA512:
-  metadata.gz: 693239e0fa3955ffad52dea7a694a4ef12d2a63b5ceba3863f5550eed736719cc2c2fe99b4b00564e9c78ef4656e1694feb73ca6207eff7b0a4d9e48bcdfb9dc
-  data.tar.gz: 6452f0e220cf4f0911112ecc248910f001a067611cb4ba7aa30ce5983c05891e621be1e406e0eafc6efcbe078e517c05eee523644034cf686dce3e7783610e4f
+  metadata.gz: d01bc7b6b71ee1e1d6287f5b66ff075f10df202bd2abb69b566d91d89915a5c43c6e1645f7b55edeaa34808330b089689e08cc2cc4d85e31efad2abdbecfc61b
+  data.tar.gz: c423d5130794d5b5feef994b6b82a4a1aac9dea321352fe44106b6135a8c44cda8a5ebaa688f78c0689190bc0584a7a322146caaf93685daa2b5f1e2433a87d8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0.pre3
+
+- (#11) Fix Rails database lifecycle and parallel coverage for pre3
+
 ## 0.2.0.pre2
 
 - Uses Rails' standard database tasks to manage worker test databases and

data/README.md

@@ -2,6 +2,17 @@
 
 `rspec-multicore-rails` loads `rspec-multicore` and automatically isolates ActiveRecord connections for Rails test workers.
 
+## Installation
+
+```ruby
+group :test do
+  gem "rspec-multicore-rails", "0.2.0.pre3"
+end
+```
+
+Normal `Bundler.require` loading requires no `require: false`, initializer, or
+manual require. The adapter loads the matching core gem automatically.
+
 Worker 1 uses the base test database. Later workers use `_2`, `_3`, and so on;
 SQLite suffixes are placed before the extension. The adapter refuses to connect
 workers outside test and clears inherited connections before connecting.

data/lib/rspec/multicore/rails/database_manager.rb

@@ -11,8 +11,9 @@ module RSpec
         TEST_ENV = "test"
 
         def initialize
-          @primary_config = ActiveRecord::Base.connection_db_config
+          @original_config = ActiveRecord::Base.connection_db_config
           @configs = test_configs
+          @primary_config = canonical_config(@original_config) || @configs.first || @original_config
           @configs << @primary_config unless @configs.include?(@primary_config)
           @base_databases = {}.compare_by_identity
           @configs.each { @base_databases[_1] = _1.database }
@@ -25,19 +26,24 @@ module RSpec
           ActiveRecord::Base.establish_connection(@primary_config)
         end
 
-        def create_workers(name: nil) = each_worker_config(name:) { database_tasks.create(_1) }
+        def create_workers(name: nil) = preserve_connection { each_worker_config(name:) { database_tasks.create(_1) } }
 
         def purge_workers(name: nil)
-          each_worker_config(name:) do |config|
-            database_tasks.purge(config)
-          rescue ActiveRecord::NoDatabaseError
-            database_tasks.create(config)
+          preserve_connection do
+            each_worker_config(name:) do |config|
+              database_tasks.purge(config)
+            rescue ActiveRecord::NoDatabaseError
+              database_tasks.create(config)
+            end
           end
         end
 
         def load_schema_workers(name: nil)
-          each_worker_config(name:) do |config|
-            database_tasks.load_schema(config, schema_format(config))
+          preserve_connection do
+            each_worker_config(name:) do |config|
+              establish_connection(config)
+              database_tasks.load_schema(config, schema_format(config))
+            end
           end
         end
 
@@ -46,7 +52,7 @@ module RSpec
           load_schema_workers(name:)
         end
 
-        def drop_workers(name: nil) = each_worker_config(name:) { database_tasks.drop(_1) }
+        def drop_workers(name: nil) = preserve_connection { each_worker_config(name:) { database_tasks.drop(_1) } }
 
         def workers = RSpec::Multicore.workers
 
@@ -67,6 +73,8 @@ module RSpec
           Array(configurations.configs_for(env_name: TEST_ENV, include_hidden: true))
         end
 
+        def canonical_config(config) = @configs.find { _1.env_name == config.env_name && _1.name == config.name }
+
         def task_configs(name: nil)
           @configs.select do |config|
             config.env_name == TEST_ENV && config.database_tasks? && (!name || config.name == name)
@@ -92,6 +100,17 @@ module RSpec
         def base_database(config) = @base_databases.fetch(config)
         def database_tasks = ActiveRecord::Tasks::DatabaseTasks
 
+        def preserve_connection
+          yield
+        ensure
+          establish_connection(@original_config)
+        end
+
+        def establish_connection(config)
+          handler = ActiveRecord::Base.connection_handler
+          handler.establish_connection(config, clobber: true)
+        end
+
         def schema_format(config)
           return config.schema_format if config.respond_to?(:schema_format)
 

data/lib/rspec/multicore/rails/version.rb

@@ -3,7 +3,7 @@
 module RSpec
   module Multicore
     module Rails
-      VERSION = "0.2.0.pre2"
+      VERSION = "0.2.0.pre3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-multicore-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
+  version: 0.2.0.pre3
 platform: ruby
 authors:
 - Sveta Markovic
@@ -55,14 +55,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre2
+        version: 0.2.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre2
+        version: 0.2.0.pre3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement