🧪 Restore optional ORM spec gating

Author: pboling

.rubocop_gradual.lock

@@ -16,29 +16,12 @@
   "lib/omniauth/strategies/identity.rb:2260468599": [
     [232, 29, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545]
   ],
-  "spec/omniauth/identity/models/couch_potato_module_spec.rb:4058643040": [
-    [42, 37, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545]
+  "spec/omniauth/strategies/identity_spec.rb:4035457592": [
+    [53, 9, 63, "RSpec/LeakyLocalVariable: Do not use local variables defined outside of examples inside of them.", 4024977967],
+    [54, 9, 47, "RSpec/LeakyLocalVariable: Do not use local variables defined outside of examples inside of them.", 2937627495],
+    [55, 9, 47, "RSpec/LeakyLocalVariable: Do not use local variables defined outside of examples inside of them.", 359943335]
   ],
-  "spec/omniauth/identity/models/mongoid_spec.rb:1626561410": [
-    [34, 37, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545]
-  ],
-  "spec/omniauth/identity/models/no_brainer_spec.rb:2371136555": [
-    [34, 32, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545],
-    [62, 39, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545]
-  ],
-  "spec/omniauth/strategies/identity_spec.rb:654570549": [
-    [19, 128, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545],
-    [52, 7, 63, "RSpec/LeakyLocalVariable: Do not use local variables defined outside of examples inside of them.", 4024977967],
-    [53, 7, 47, "RSpec/LeakyLocalVariable: Do not use local variables defined outside of examples inside of them.", 2937627495],
-    [54, 7, 47, "RSpec/LeakyLocalVariable: Do not use local variables defined outside of examples inside of them.", 359943335],
-    [213, 12, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545],
-    [221, 20, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545],
-    [226, 20, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545],
-    [272, 31, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545],
-    [347, 31, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545],
-    [370, 14, 1, "Style/TrailingCommaInHashLiteral: Avoid comma after the last item of a hash.", 177545]
-  ],
-  "spec/spec_helper.rb:1331183603": [
+  "spec/spec_helper.rb:3214074318": [
     [39, 4, 52, "Style/YodaCondition: Reverse the order of the operands `VersionGem::Ruby::RUBY_VER < Gem::Version.new(\"2.5\")`.", 3054081885]
   ],
   "spec/support/shared_contexts/instance_with_instance_methods.rb:540999892": [

.simplecov

@@ -6,12 +6,42 @@
 
 require "kettle/soup/cover/config"
 
+omniauth_identity_bundled_gem = lambda do |*names|
+  specs = if defined?(Bundler)
+    Bundler.load.specs
+  else
+    Gem::Specification
+  end
+
+  names.any? do |name|
+    begin
+      if specs.respond_to?(:find_by_name)
+        specs.find_by_name(name)
+      else
+        specs.any? { |spec| spec.name == name }
+      end
+    rescue Gem::LoadError
+      false
+    end
+  end
+end
+
 omniauth_identity_service_adapter_enabled = lambda do |adapter|
   enabled_values = %w[true 1 yes on]
   enabled_values.include?(ENV.fetch("OMNIAUTH_IDENTITY_ENABLE_SERVICE_ADAPTERS", "false").downcase) ||
     enabled_values.include?(ENV.fetch("OMNIAUTH_IDENTITY_ENABLE_#{adapter}", "false").downcase)
 end
 
+omniauth_identity_sqlite3_enabled = lambda do
+  return true if %w[true 1 yes on].include?(ENV.fetch("OMNIAUTH_IDENTITY_ENABLE_SQLITE3", "false").downcase)
+
+  if RUBY_ENGINE == "jruby"
+    omniauth_identity_bundled_gem.call("jdbc-sqlite3", "activerecord-jdbcsqlite3-adapter")
+  else
+    omniauth_identity_bundled_gem.call("sqlite3")
+  end
+end
+
 # Minimum coverage thresholds are set by kettle-soup-cover.
 # They are controlled by ENV variables loaded by `mise` from `mise.toml`
 # (with optional machine-local overrides in `.env.local`).
@@ -25,4 +55,7 @@ SimpleCov.start do
   add_filter "lib/omniauth/identity/models/couch_potato.rb" unless omniauth_identity_service_adapter_enabled.call("COUCHDB")
   add_filter "lib/omniauth/identity/models/mongoid.rb" unless omniauth_identity_service_adapter_enabled.call("MONGODB")
   add_filter "lib/omniauth/identity/models/nobrainer.rb" unless omniauth_identity_service_adapter_enabled.call("RETHINKDB")
+  add_filter "lib/omniauth/identity/models/active_record.rb" unless omniauth_identity_sqlite3_enabled.call
+  add_filter "lib/omniauth/identity/models/rom.rb" unless omniauth_identity_sqlite3_enabled.call
+  add_filter "lib/omniauth/identity/models/sequel.rb" unless omniauth_identity_sqlite3_enabled.call
 end

CHANGELOG.md

@@ -28,6 +28,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Fixed
 
+- Restored ORM-specific spec rake tasks and made optional ORM spec files avoid
+  loading unavailable adapter gems when the matching appraisal does not include them.
+
 ### Security
 
 ## [3.2.0] - 2026-06-05

Rakefile

@@ -131,6 +131,64 @@ rescue LoadError
   warn("NOTE: kettle-dev isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
 end
 
+### ORM SPEC TASKS
+def run_omniauth_identity_specs(env, *paths)
+  sh(env, "bundle", "exec", "rspec", *paths)
+end
+
+namespace :spec do
+  namespace :orm do
+    desc "Run ActiveRecord-backed ORM and strategy specs"
+    task :active_record do
+      run_omniauth_identity_specs(
+        {"OMNIAUTH_IDENTITY_ENABLE_SQLITE3" => "true"},
+        "spec/omniauth/identity/models/active_record_spec.rb",
+        "spec/omniauth/strategies/identity_spec.rb"
+      )
+    end
+
+    desc "Run CouchPotato-backed ORM specs"
+    task :couch_potato do
+      run_omniauth_identity_specs(
+        {"OMNIAUTH_IDENTITY_ENABLE_COUCHDB" => "true"},
+        "spec/omniauth/identity/models/couch_potato_module_spec.rb"
+      )
+    end
+
+    desc "Run Mongoid-backed ORM specs"
+    task :mongoid do
+      run_omniauth_identity_specs(
+        {"OMNIAUTH_IDENTITY_ENABLE_MONGODB" => "true"},
+        "spec/omniauth/identity/models/mongoid_spec.rb"
+      )
+    end
+
+    desc "Run NoBrainer-backed ORM specs"
+    task :nobrainer do
+      run_omniauth_identity_specs(
+        {"OMNIAUTH_IDENTITY_ENABLE_RETHINKDB" => "true"},
+        "spec/omniauth/identity/models/no_brainer_spec.rb"
+      )
+    end
+
+    desc "Run ROM-backed ORM specs"
+    task :rom do
+      run_omniauth_identity_specs(
+        {"OMNIAUTH_IDENTITY_ENABLE_SQLITE3" => "true"},
+        "spec/omniauth/identity/models/rom_spec.rb"
+      )
+    end
+
+    desc "Run Sequel-backed ORM specs"
+    task :sequel do
+      run_omniauth_identity_specs(
+        {"OMNIAUTH_IDENTITY_ENABLE_SQLITE3" => "true"},
+        "spec/omniauth/identity/models/sequel_spec.rb"
+      )
+    end
+  end
+end
+
 ### DUPLICATE DRIFT TASKS
 begin
   require "kettle/drift"

spec/omniauth/identity/models/active_record_spec.rb

@@ -1,65 +1,67 @@
 # frozen_string_literal: true
 
-# Bugfixes
-# JRuby needed an explicit "require 'logger'" for Rails < 7.1
-# See: https://github.com/rails/rails/issues/54260#issuecomment-2594650047
-# Placing above omniauth because it is a dependency of omniauth,
-#   which is undeclared in older versions.
-require "logger"
+if omniauth_identity_sqlite3_enabled? && omniauth_identity_bundled_gem?("activerecord", "anonymous_active_record")
+  # Bugfixes
+  # JRuby needed an explicit "require 'logger'" for Rails < 7.1
+  # See: https://github.com/rails/rails/issues/54260#issuecomment-2594650047
+  # Placing above omniauth because it is a dependency of omniauth,
+  #   which is undeclared in older versions.
+  require "logger"
 
-require "active_record"
-require "anonymous_active_record"
+  require "active_record"
+  require "anonymous_active_record"
 
-class TestIdentity < OmniAuth::Identity::Models::ActiveRecord; end
+  class TestIdentity < OmniAuth::Identity::Models::ActiveRecord; end
 
-RSpec.describe(OmniAuth::Identity::Models::ActiveRecord, :sqlite3) do
-  describe "model", type: :model do
-    subject(:model_definition) { -> { model_klass } }
+  RSpec.describe(OmniAuth::Identity::Models::ActiveRecord, :sqlite3) do
+    describe "model", type: :model do
+      subject(:model_definition) { -> { model_klass } }
 
-    let(:model_klass) do
-      AnonymousActiveRecord.generate(
-        parent_klass: "OmniAuth::Identity::Models::ActiveRecord",
-        columns: OmniAuth::Identity::Model::SCHEMA_ATTRIBUTES | %w[provider password_digest],
-        connection_params: {adapter: distinguish_jdbc_driver ? "jdbcsqlite3" : "sqlite3", encoding: "utf8", database: ":memory:"}
-      ) do
-        auth_key :email
-        def flower
-          "🌸"
+      let(:model_klass) do
+        AnonymousActiveRecord.generate(
+          parent_klass: "OmniAuth::Identity::Models::ActiveRecord",
+          columns: OmniAuth::Identity::Model::SCHEMA_ATTRIBUTES | %w[provider password_digest],
+          connection_params: {adapter: distinguish_jdbc_driver ? "jdbcsqlite3" : "sqlite3", encoding: "utf8", database: ":memory:"}
+        ) do
+          auth_key :email
+          def flower
+            "🌸"
+          end
         end
       end
-    end
 
-    let(:distinguish_jdbc_driver) { RUBY_PLATFORM == "java" && defined?(ArJdbc::Version) && Gem::Version.create(ArJdbc::Version) >= Gem::Version.create("72.0") }
+      let(:distinguish_jdbc_driver) { RUBY_PLATFORM == "java" && defined?(ArJdbc::Version) && Gem::Version.create(ArJdbc::Version) >= Gem::Version.create("72.0") }
 
-    include_context "with persistable model"
+      include_context "with persistable model"
 
-    describe "::table_name" do
-      it "does not use STI rules for its table name" do
-        expect(TestIdentity.table_name).to(eq("test_identities"))
+      describe "::table_name" do
+        it "does not use STI rules for its table name" do
+          expect(TestIdentity.table_name).to(eq("test_identities"))
+        end
       end
-    end
 
-    describe "::locate" do
-      it "delegates locate to the where query method" do
-        args = {
-          email: "open faced",
-          category: "sandwiches",
-          provider: "identity"
-        }
-        allow(model_klass).to(receive(:where).with(args).and_return(["wakka"]))
-        expect(model_klass.locate(args)).to(eq("wakka"))
+      describe "::locate" do
+        it "delegates locate to the where query method" do
+          args = {
+            email: "open faced",
+            category: "sandwiches",
+            provider: "identity"
+          }
+          allow(model_klass).to(receive(:where).with(args).and_return(["wakka"]))
+          expect(model_klass.locate(args)).to(eq("wakka"))
+        end
       end
-    end
 
-    describe "#inspect" do
-      it "filters password-related attributes from ActiveRecord inspect output" do
-        instance = model_klass.new(email: DEFAULT_EMAIL, password: DEFAULT_PASSWORD, password_confirmation: DEFAULT_PASSWORD)
-        inspected = instance.inspect
+      describe "#inspect" do
+        it "filters password-related attributes from ActiveRecord inspect output" do
+          instance = model_klass.new(email: DEFAULT_EMAIL, password: DEFAULT_PASSWORD, password_confirmation: DEFAULT_PASSWORD)
+          inspected = instance.inspect
 
-        expect(inspected).to include(DEFAULT_EMAIL)
-        expect(inspected).not_to include(DEFAULT_PASSWORD)
-        expect(inspected).not_to include(instance.password_digest)
-        expect(inspected).to include("password_digest: [FILTERED]")
+          expect(inspected).to include(DEFAULT_EMAIL)
+          expect(inspected).not_to include(DEFAULT_PASSWORD)
+          expect(inspected).not_to include(instance.password_digest)
+          expect(inspected).to include("password_digest: [FILTERED]")
+        end
       end
     end
   end

spec/omniauth/identity/models/couch_potato_module_spec.rb

@@ -1,48 +1,50 @@
 # frozen_string_literal: true
 
-# Bugfixes
-# JRuby needed an explicit "require 'logger'" for Rails < 7.1
-# See: https://github.com/rails/rails/issues/54260#issuecomment-2594650047
-# Placing above omniauth because it is a dependency of omniauth,
-#   which is undeclared in older versions.
-require "logger"
-require "active_support"
-
-require "couch_potato"
-
-RSpec.describe(OmniAuth::Identity::Models::CouchPotatoModule, :couchdb) do
-  before(:context) do
-    CouchPotato::Config.database_host = "http://admin:#{ENV.fetch("COUCHDB_PASSWORD", "password")}@127.0.0.1:5984"
-    CouchPotato::Config.database_name = "test"
-    CouchPotato.couchrest_database.recreate!
-  end
+if omniauth_identity_service_adapter_enabled?("COUCHDB") && omniauth_identity_bundled_gem?("couch_potato")
+  # Bugfixes
+  # JRuby needed an explicit "require 'logger'" for Rails < 7.1
+  # See: https://github.com/rails/rails/issues/54260#issuecomment-2594650047
+  # Placing above omniauth because it is a dependency of omniauth,
+  #   which is undeclared in older versions.
+  require "logger"
+  require "active_support"
+
+  require "couch_potato"
+
+  RSpec.describe(OmniAuth::Identity::Models::CouchPotatoModule, :couchdb) do
+    before(:context) do
+      CouchPotato::Config.database_host = "http://admin:#{ENV.fetch("COUCHDB_PASSWORD", "password")}@127.0.0.1:5984"
+      CouchPotato::Config.database_name = "test"
+      CouchPotato.couchrest_database.recreate!
+    end
 
-  before do
-    couch_potato_test_identity = Class.new do
-      # NOTE: CouchPotato::Persistence must be included before OmniAuth::Identity::Models::CouchPotatoModule
-      include CouchPotato::Persistence
+    before do
+      couch_potato_test_identity = Class.new do
+        # NOTE: CouchPotato::Persistence must be included before OmniAuth::Identity::Models::CouchPotatoModule
+        include CouchPotato::Persistence
 
-      include OmniAuth::Identity::Models::CouchPotatoModule
+        include OmniAuth::Identity::Models::CouchPotatoModule
 
-      property :email
-      property :password_digest
+        property :email
+        property :password_digest
+      end
+      stub_const("CouchPotatoTestIdentity", couch_potato_test_identity)
     end
-    stub_const("CouchPotatoTestIdentity", couch_potato_test_identity)
-  end
 
-  describe "model", type: :model do
-    let(:model_klass) { CouchPotatoTestIdentity }
+    describe "model", type: :model do
+      let(:model_klass) { CouchPotatoTestIdentity }
 
-    include_context "with persistable model"
+      include_context "with persistable model"
 
-    describe "::locate" do
-      it "delegates to the where query method" do
-        args = {
-          "email" => "open faced",
-          "category" => "sandwiches",
-        }
-        allow(model_klass).to(receive(:where).with(args).and_return(["wakka"]))
-        expect(model_klass.locate(args)).to(eq("wakka"))
+      describe "::locate" do
+        it "delegates to the where query method" do
+          args = {
+            "email" => "open faced",
+            "category" => "sandwiches"
+          }
+          allow(model_klass).to(receive(:where).with(args).and_return(["wakka"]))
+          expect(model_klass.locate(args)).to(eq("wakka"))
+        end
       end
     end
   end