🧪 Improve CI harness integration

Author: pboling

.github/workflows/coverage.yml

@@ -55,13 +55,13 @@ jobs:
     steps:
       ### COUCHDB
       - name: Start CouchDB
-        uses: iamssen/couchdb-github-action@5456fb038864d42f8b82d4c29e3c1decd7fa82fd # master
+        uses: iamssen/couchdb-github-action@master
         with:
           couchdb-version: "3.4.1"
 
       ### MONGODB
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@90002f17bc44255a478ffc85b2401743d8367152 # v1.12.1
+        uses: supercharge/mongodb-github-action@1.12.1
         with:
           mongodb-version: "8.0"
 

.github/workflows/locked_deps.yml

@@ -36,13 +36,13 @@ env:
 on:
   push:
     branches:
-      - 'main'
-      - '*-stable'
+      - "main"
+      - "*-stable"
     tags:
-      - '!*' # Do not execute on tags
+      - "!*" # Do not execute on tags
   pull_request:
     branches:
-      - '*'
+      - "*"
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
@@ -70,6 +70,24 @@ jobs:
             experimental: false
 
     steps:
+      ### COUCHDB
+      - name: Start CouchDB
+        uses: iamssen/couchdb-github-action@master
+        with:
+          couchdb-version: "3.4.1"
+
+      ### MONGODB
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.12.1
+        with:
+          mongodb-version: "8.0"
+
+      ### SMOKE-TEST
+      - name: Smoke CouchDB
+        run: |
+          curl -f http://127.0.0.1:5984/
+          curl -X POST -H "Content-Type: application/json; charset=utf-8" -d '{"name": "admin", "password": "password"}' http://127.0.0.1:5984/_session
+
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:

.github/workflows/unlocked_deps.yml

@@ -26,13 +26,13 @@ env:
 on:
   push:
     branches:
-      - 'main'
-      - '*-stable'
+      - "main"
+      - "*-stable"
     tags:
-      - '!*' # Do not execute on tags
+      - "!*" # Do not execute on tags
   pull_request:
     branches:
-      - '*'
+      - "*"
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
@@ -61,6 +61,24 @@ jobs:
             bundler: latest
 
     steps:
+      ### COUCHDB
+      - name: Start CouchDB
+        uses: iamssen/couchdb-github-action@master
+        with:
+          couchdb-version: "3.4.1"
+
+      ### MONGODB
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.12.1
+        with:
+          mongodb-version: "8.0"
+
+      ### SMOKE-TEST
+      - name: Smoke CouchDB
+        run: |
+          curl -f http://127.0.0.1:5984/
+          curl -X POST -H "Content-Type: application/json; charset=utf-8" -d '{"name": "admin", "password": "password"}' http://127.0.0.1:5984/_session
+
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:

Appraisals

@@ -47,10 +47,15 @@ appraise "unlocked_deps" do
   eval_gemfile "modular/optional.gemfile"
   eval_gemfile "modular/style.gemfile"
   eval_gemfile "modular/x_std_libs.gemfile"
+  gem "couch_potato", "~> 1.17"
+  gem "mongoid", "~> 9.0", ">= 9.0.3"
+  gem "mongoid-rspec", "~> 4.2"
   gem "sequel", "~> 5.86", ">= 5.86.0"
   gem "rom-sql", "~> 3.7"
   eval_gemfile "modular/activerecord/r3/v8.0.gemfile"
+  eval_gemfile "modular/bson/r3/v5.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
+  gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
 end
 
 appraise "head" do
@@ -84,6 +89,7 @@ end
 
 appraise "ruby-3-0" do
   eval_gemfile "modular/x_std_libs/r3.1/libs.gemfile"
+  gem "json", "< 2.16"
 end
 
 appraise "ruby-3-1" do
@@ -92,7 +98,7 @@ end
 
 appraise "ruby-3-2" do
   eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
-  gem "json", "< 2.19"
+  gem "json", "< 2.16"
 end
 
 appraise "ruby-3-3" do

Rakefile

@@ -209,6 +209,21 @@ begin
     end
   end
 
+  orm_specs.each do |orm, spec_file|
+    RSpec::Core::RakeTask.new("spec_orm_#{orm}") do |task|
+      task.pattern = spec_file
+    end
+  end
+
+  desc("Run all ORM specs (requires CouchDB and MongoDB running; NoBrainer remains isolated)")
+  task(spec_orms: %i[
+    spec_orm_active_record
+    spec_orm_couch_potato
+    spec_orm_mongoid
+    spec_orm_rom
+    spec_orm_sequel
+  ])
+
   task(default: :test)
 rescue LoadError
   desc("spec task stub")

gemfiles/unlocked_deps.gemfile

@@ -2,21 +2,28 @@
 
 source "https://gem.coop"
 
+gem "irb", "~> 1.17"
+gem "couch_potato", "~> 1.17"
+gem "mongoid", "~> 9.0", ">= 9.0.3"
+gem "mongoid-rspec", "~> 4.2"
 gem "sequel", "~> 5.86", ">= 5.86.0"
 gem "rom-sql", "~> 3.7"
+gem "ostruct", "~> 0.6", ">= 0.6.1"
 
-gemspec path: "../"
-
-eval_gemfile("modular/activerecord/r3/v8.0.gemfile")
-
-eval_gemfile("modular/omniauth/r3/v2.1.gemfile")
+gemspec :path => "../"
 
 eval_gemfile("modular/coverage.gemfile")
 
 eval_gemfile("modular/documentation.gemfile")
 
-eval_gemfile("modular/style.gemfile")
-
 eval_gemfile("modular/optional.gemfile")
 
+eval_gemfile("modular/style.gemfile")
+
 eval_gemfile("modular/x_std_libs.gemfile")
+
+eval_gemfile("modular/activerecord/r3/v8.0.gemfile")
+
+eval_gemfile("modular/bson/r3/v5.1.gemfile")
+
+eval_gemfile("modular/omniauth/r3/v2.1.gemfile")

spec/omniauth/identity/models/couch_potato_module_spec.rb

@@ -6,6 +6,7 @@
 # Placing above omniauth because it is a dependency of omniauth,
 #   which is undeclared in older versions.
 require "logger"
+require "active_support"
 
 require "couch_potato"
 

spec/omniauth/identity/models/no_brainer_spec.rb

@@ -14,48 +14,56 @@
 #       If you try it, one or both of them will not work.
 #
 # However, if you have RethinkDB installed locally, this spec should work in isolation!
-require "nobrainer"
-
-RSpec.describe(OmniAuth::Identity::Models::NoBrainer, :rethinkdb) do
-  before(:context) do
-    NoBrainer.configure do |config|
-      config.app_name = "DeezBrains"
-      config.rethinkdb_urls = ["rethinkdb://127.0.0.1:28015/DeezBrains_test"]
-      config.table_options = {
-        shards: 1,
-        replicas: 1,
-        write_acks: :majority,
-      }
+if ENV.fetch("CI", "false").casecmp("true").zero? && ENV.fetch("OMNIAUTH_IDENTITY_ENABLE_RETHINKDB", "false").casecmp("true") != 0
+  RSpec.describe("NoBrainer ORM", :rethinkdb) do
+    it("is isolated to local RethinkDB-enabled runs") do
+      skip("NoBrainer specs require RethinkDB; set OMNIAUTH_IDENTITY_ENABLE_RETHINKDB=true to run them in CI")
     end
-    NoBrainer.sync_schema
   end
+else
+  require "nobrainer"
 
-  before do
-    nobrainer_test_identity = Class.new do
-      include NoBrainer::Document
+  RSpec.describe(OmniAuth::Identity::Models::NoBrainer, :rethinkdb) do
+    before(:context) do
+      NoBrainer.configure do |config|
+        config.app_name = "DeezBrains"
+        config.rethinkdb_urls = ["rethinkdb://127.0.0.1:28015/DeezBrains_test"]
+        config.table_options = {
+          shards: 1,
+          replicas: 1,
+          write_acks: :majority,
+        }
+      end
+      NoBrainer.sync_schema
+    end
+
+    before do
+      nobrainer_test_identity = Class.new do
+        include NoBrainer::Document
 
-      include OmniAuth::Identity::Models::NoBrainer
+        include OmniAuth::Identity::Models::NoBrainer
 
-      field :email
-      field :password_digest
+        field :email
+        field :password_digest
+      end
+      stub_const("NoBrainerTestIdentity", nobrainer_test_identity)
+      NoBrainer.purge!
     end
-    stub_const("NoBrainerTestIdentity", nobrainer_test_identity)
-    NoBrainer.purge!
-  end
 
-  describe "model", type: :model do
-    let(:model_klass) { NoBrainerTestIdentity }
+    describe "model", type: :model do
+      let(:model_klass) { NoBrainerTestIdentity }
 
-    include_context "with persistable model"
+      include_context "with persistable model"
 
-    describe "::locate" do
-      it "delegates locate 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 locate 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

spec/omniauth/identity/models/rom_spec.rb

@@ -4,24 +4,23 @@
 
 RSpec.describe(OmniAuth::Identity::Models::Rom, :sqlite3) do
   before do
-    # Use create_table? so this is idempotent and safe to run before each example.
-    ROM_DB.create_table?(:rom_test_identities) do
+    ROM_DB.drop_table?(:rom_test_identities)
+    ROM_DB.drop_table?(:rom_test_owners)
+
+    ROM_DB.create_table(:rom_test_identities) do
       primary_key :id
       String :email, null: false
       String :password_digest, null: false
+      String :pwd_hash
       # Add the login column to support tests that use a non-standard auth_key
       String :login
       Integer :owner_id
     end
 
-    ROM_DB.create_table?(:rom_test_owners) do
+    ROM_DB.create_table(:rom_test_owners) do
       primary_key :id
       String :name, null: false
     end
-
-    # Clear the tables before each test
-    ROM_DB[:rom_test_identities].delete
-    ROM_DB[:rom_test_owners].delete
   end
 
   describe "model", type: :model do

spec/spec_helper.rb

@@ -60,6 +60,10 @@
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
 
+  if ENV.fetch("CI", "false").casecmp("true").zero? && ENV.fetch("OMNIAUTH_IDENTITY_ENABLE_RETHINKDB", "false").casecmp("true") != 0
+    config.filter_run_excluding(rethinkdb: true)
+  end
+
   # Disable RSpec exposing methods globally on `Module` and `main`
   config.disable_monkey_patching!